From 65b9b81171843545bc17a8e7167ff06c3d80e73d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 18 九月 2023 16:00:54 +0800
Subject: [PATCH] 调整上海接口加密问题
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
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 29cd89c..36241be 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -7,6 +7,7 @@
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.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeOut;
@@ -16,12 +17,12 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 绮鍑哄簱淇℃伅
@@ -79,7 +80,6 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
- Calendar c = Calendar.getInstance();
for (Fz40InoutRecord sysData : list) {
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +95,15 @@
}
apiData = new Api1205();
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));
-
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ Date time = dateFormat.parse(sysData.getId().substring(2, 10));
+ int numDay = DateUtil.difDay(sysData.getCompleteTime(), time);
+ if(numDay != 0){
+ sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
+ sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
+ sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -120,9 +128,7 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
- c.setTime(sysData.getRegisterTime());
- c.add(Calendar.MINUTE,-3);
- apiData.setDjsj(c.getTime());
+ apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
@@ -156,12 +162,10 @@
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
- c.setTime(sysData.getCompleteTime());
- c.add(Calendar.MINUTE,3);
- apiData.setCmsj(c.getTime());
+ apiData.setCmsj(sysData.getCompleteTime());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
- apiData.setZhgxsj(c.getTime());
+ apiData.setZhgxsj(sysData.getUpdateTime());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
--
Gitblit v1.9.3