From 13391e649a65a374e390066a35b52c61a6feaa3f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 14 十一月 2023 21:19:40 +0800
Subject: [PATCH] 调整心跳指令返回
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
index c0c268d..bbb1b5f 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
@@ -1,6 +1,7 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiLog;
@@ -36,6 +37,8 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
+ private Api1102Rep api1102Rep;
+ @Autowired
private Api1204Rep api1204Rep;
@Autowired
private ApiCommonService commonService;
@@ -62,20 +65,28 @@
apiLog.setId(ContextUtil.getUUID());
try {
//鑾峰彇绮鍏ュ簱缁撶畻淇℃伅
- List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
+ List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(deptId, INOUT_TYPE_IN, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮伯椋熷叆搴撶粨绠椾俊鎭�------------------");
return;
}
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯淇℃伅
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
Api1204 apiData;
Api1105 api1105;
+ List<Api1204> api1204List;
for (Fz40InoutSettle sysData : list) {
apiData = new Api1204();
- //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
- apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
+ //鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyyyMMdd + 4涓洪『搴忓彿
+ apiData.setRkjsdh(kqdm + sysData.getId());
+
+ //鍚堝悓鍙�
+ if(StringUtils.isNotEmpty(sysData.getContractId())){
+ apiData.setHth(api1102.getDwdm() + sysData.getContractId());
+ }
if(StringUtils.isNotEmpty(sysData.getDepotId())){
api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -103,8 +114,7 @@
apiData.setFkdw(sysData.getPayUnit());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setCzbz(Constant.CZBZ_I);
- apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
@@ -112,6 +122,12 @@
apiData.setSyncTime(new Date());
log.info("1204---鍚屾鏁版嵁锛歿}", apiData.toString());
//淇濆瓨鏁版嵁
+ api1204List = api1204Rep.getDataById(apiData.getRkjsdh());
+ if (null == api1204List || api1204List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1204List.get(0).getCzbz());
+ }
api1204Rep.save(apiData);
}
} catch (Exception e) {
--
Gitblit v1.9.3