From 24da09489db83167c91f5920a92ea19f29d96829 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 10 十一月 2023 20:14:03 +0800
Subject: [PATCH] 优化上海接口同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 6144701..03b7474 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -1,14 +1,14 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1202;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
+import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
@@ -48,7 +48,11 @@
@Autowired
private ApiTriggerService apiTriggerService;
@Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@Autowired
@@ -86,6 +90,8 @@
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
List<Fz40InoutRecordItem> listInoutRecordItem;
+ List<Api1201> api1201List;
+ List<Api1404> api1404List;
for (Fz40InoutRecord sysData : list) {
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
@@ -117,14 +123,21 @@
apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
- //鑾峰彇鍚堝悓鍙�
+ //鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ //鍚堝悓鍙�
if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
- apiData.setHth(api1105.getHwdm().substring(0, 18) + listInoutNotice.get(0).getContractId());
+ api1201List = api1201Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if(null != api1201List && api1201List.size() > 0){
+ apiData.setHth(api1201List.get(0).getHth());
+ }
}
if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
- apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
+ api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+ if(null != api1404List && api1404List.size() > 0){
+ apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ }
}
}
@@ -160,6 +173,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
@@ -171,6 +187,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if (null == sysData.getEmptyWeightTime()) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
@@ -202,12 +221,7 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- if (null == api1202List || api1202List.isEmpty()) {
- apiData.setCzbz(Constant.CZBZ_I);
- } else {
- apiData.setCzbz(api1202List.get(0).getCzbz());
- }
+
//鍒ゆ柇鏄惁涓鸿埞杩�
if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -225,11 +239,22 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
-
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
api1202Rep.save(apiData);
idNum++;
}
} else {
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
}
--
Gitblit v1.9.3