From 7acebbb64838e26f38f45b9ce51b568841eb5a18 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 17 十一月 2023 17:19:00 +0800
Subject: [PATCH] 优化数据
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 3 +++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java | 2 +-
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 8 +++-----
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 3 +++
9 files changed, 19 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 cf153a7..df649f3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -244,6 +244,9 @@
} else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
+ if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+ apiData.setCzbz(Constant.CZBZ_D);
+ }
api1202Rep.save(apiData);
idNum++;
}
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 daa4666..07ed285 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -101,6 +101,9 @@
int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
listIds.add(Constant.INOUT_TYPE_14 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
idNum ++;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 7c917fe..3af09f4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -210,6 +210,9 @@
int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+ if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
+ continue;
+ }
if(fz40InoutRecordItem.getSettleWeight() <= 0){
continue;
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
index fa039b0..4defff4 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -120,7 +120,7 @@
api1302.setLssdzjh(getHumPointList2(fz40Grain.getPoints(), fz40Grain.getCable(), fz40Grain.getCableCir()));
}
- api1302.setZhgxsj(fz40Grain.getReceiveDate());
+ api1302.setZhgxsj(new Date());
api1302.setBizId(fz40Grain.getBatchId());
api1302.setKqdm(api1105.getKqdm());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
index d1dcf33..e74b814 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
@@ -105,11 +105,11 @@
api1303.setCldjpd("533");
}
- api1303.setZhgxsj(syncTime);
+ api1303.setZhgxsj(new Date());
api1303.setBizId(fz40Pest.getBatchId());
api1303.setKqdm(api1105.getKqdm());
- api1303.setSyncTime(syncTime);
+ api1303.setSyncTime(new Date());
api1303List = api1303Rep.getDataByHcjcdh(api1303.getHcjcdh());
if (null == api1303List || api1303List.isEmpty()) {
api1303.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
index 6ff55c2..9df34fd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
@@ -79,11 +79,11 @@
api1304 = updateGasInfo(api1304, fz40Gas.getPoints());
- api1304.setZhgxsj(syncTime);
+ api1304.setZhgxsj(new Date());
api1304.setBizId(fz40Gas.getBatchId());
api1304.setKqdm(api1105.getKqdm());
- api1304.setSyncTime(syncTime);
+ api1304.setSyncTime(new Date());
api1304List = api1304Rep.getDataByQtndjcdh(api1304.getQtndjcdh());
if (null == api1304List || api1304List.isEmpty()) {
api1304.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
index 0d9cfac..1b47e7e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
@@ -92,7 +92,7 @@
api1305.setTfzyfzr(fzAreationData.getChargeUser());
api1305.setTfzyry(fzAreationData.getOperators());
api1305.setTfsc(fzAreationData.getLongTime());
- api1305.setZhgxsj(fzAreationData.getUpdateTime());
+ api1305.setZhgxsj(new Date());
api1305.setKqdm(kqdm);
api1305.setBizId(fzAreationData.getId());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 390f915..beaf755 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -90,7 +90,7 @@
api1306.setSqff(fz40DrugLog.getVentilateMethod());
api1306.setSqjsslhqnd(fz40DrugLog.getAfterPh3());
api1306.setXzxgpj(fz40DrugLog.getEvaluate());
- api1306.setZhgxsj(fz40DrugLog.getUpdateTime());
+ api1306.setZhgxsj(new Date());
api1306.setHwdm(api1105.getHwdm());
api1306.setKqdm(kqdm);
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index be60750..b471511 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -428,8 +428,6 @@
//杞崲璁″垝鏄庣粏锛屼笉鍗曠嫭涓婁紶锛屽湪杞崲璁″垝涓粺涓�涓婁紶
return null;
}
-
-// changeObject(data);
return JSON.toJSONString(data);
}
@@ -443,7 +441,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("03");
gdFinanceDto.setCzbz(api1503.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -495,7 +493,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("02");
gdFinanceDto.setCzbz(api1502.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -548,7 +546,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("01");
gdFinanceDto.setCzbz(api1501.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
paddingData(gdFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
--
Gitblit v1.9.3