From c75c27634f569b439c83d606b052257df3d82f0a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 26 三月 2025 15:36:54 +0800
Subject: [PATCH] 数据同步调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 17 ++++++++++-------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 17 +++++++++++++++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 4 +---
3 files changed, 26 insertions(+), 12 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 03248a5..d51a723 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -216,9 +216,7 @@
if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
- if (!sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
- sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getCheckTime(), 30));
- }
+
apiData.setPzjlsj(sysData.getEmptyWeightTime());
apiData.setPzjby(sysData.getEmptyWeightUser());
apiData.setPzjly(sysData.getEmptyWeightUser());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 77b5fe1..eb80be6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -146,7 +146,7 @@
sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
}
- apiData.setQysj(sysData.getRegisterTime());
+
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -186,7 +186,20 @@
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
+ if (null == sysData.getCheckTime()) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ if (sysData.getCheckTime().after(sysData.getEmptyWeightTime())) {
+ sysData.setCheckTime(DateUtils.addMinutes(sysData.getFullWeightTime(), -5));
+ }
+ apiData.setJysj(sysData.getCheckTime());
+ if (null == sysData.getSampleTime()) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ if (sysData.getSampleTime().after(sysData.getCheckTime())) {
+ sysData.setSampleTime(DateUtils.addMinutes(sysData.getCheckTime(), -1));
+ }
+ apiData.setQysj(sysData.getSampleTime());
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 72d6d97..97303de 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -108,7 +108,7 @@
apiData.setCd(mappingCode);
apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
-
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
apiData.setLqxzqhdm(api1102.getXzqhdm());
if (apiData.getLsxzdm().equals("121")) {
//鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
@@ -120,15 +120,18 @@
}
//绮潈褰掑睘鍗曚綅
- api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
- apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
- apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
- apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
+ if (null == apiData.getLqgsdwdm()) {
+ api1208List = api1208Rep.findDataByHwdm(api1105.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLqgsdwdm(api1208List.get(0).getLqgsdwdm());
+ apiData.setLqxzqhdm(api1208List.get(0).getLqxzqhdm());
+ apiData.setLqgstydwbm(api1208List.get(0).getLqgstydwbm());
+ }
}
+
//鑻ヤ负鍟嗗搧绮紝鍒欑伯鏉冩�ц川鍖哄垝浠ｇ爜涓簄ull
- if("200".equals(apiData.getLsxzdm())){
+ if ("200".equals(apiData.getLsxzdm())) {
apiData.setLqxzqhdm(null);
}
--
Gitblit v1.9.3