From 7bfee511ecfa17d63fa9a0908fdecdf199b13aaf Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 26 一月 2024 14:57:00 +0800
Subject: [PATCH] 优化宁夏接口-库区图监控点位标注
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 101db1e..407c8d8 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -80,6 +80,9 @@
List<Fz35InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
for (Fz35InoutRecord sysData : list) {
+ if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
+ continue;
+ }
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
}
@@ -115,7 +118,7 @@
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
- apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
+ apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -135,7 +138,7 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -153,7 +156,7 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
+ if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -164,7 +167,7 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
+ if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -176,15 +179,16 @@
apiData.setQzsfzkl(0 - sysData.getDeWet());
apiData.setQzzzzkl(0 - sysData.getDeImpurity());
- //鍖呰
- // apiData.setBzwkl(0 - sysData.getDePack());
//鍏跺畠
+ if(null == sysData.getDeOther()){
+ sysData.setDeOther(0.0);
+ }
apiData.setQtkl( 0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
apiData.setXckl( 0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
+ if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
--
Gitblit v1.9.3