From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
index 84d45a6..2296440 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Grain;
import com.ld.igds.models.InteStatusLog;
@@ -11,10 +10,10 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
-import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -23,9 +22,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
/**
* 娓╂箍搴︽娴嬫帴鍙�
@@ -56,16 +56,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1401);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ娓╂箍搴︿俊鎭紝鍗崇伯鎯呬俊鎭�
List<Grain> dataList = hApiShServiceImpl.listGrain(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -80,10 +83,10 @@
//灏佽鏁版嵁淇℃伅
for (Grain grain : dataList) {
dto1401 = new Dto1401();
- dto1401.setLqjcbm(grain.getDepotId() + grain.getBatchId());
+ dto1401.setLqjcbm(ApiShUtil.getGbDepotId(grain.getDepotId()) + grain.getBatchId());
dto1401.setJcsj(DateFormatUtils.format(grain.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
- dto1401.setHwbm(grain.getDepotId());
+ dto1401.setHwbm(ApiShUtil.getGbDepotId(grain.getDepotId()) + "01");
dto1401.setCfww(String.valueOf(grain.getTempOut()));
dto1401.setCfws(String.valueOf(grain.getHumidityOut()));
dto1401.setCfnw(String.valueOf(grain.getTempIn()));
@@ -96,9 +99,9 @@
} else {
dto1401.setLswdzjh(getPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
}
- dto1401.setNm(grain.getDepotId().substring(0, 21));
- dto1401.setZznm(grain.getDepotId().substring(0, 21));
- dto1401.setCfnm(grain.getDepotId().substring(0, 21));
+ dto1401.setNm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 21));
+ dto1401.setZznm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 21));
+ dto1401.setCfnm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 25));
dto1401.setDqwd(String.valueOf(grain.getTempOut()));
dto1401.setDqsd(String.valueOf(grain.getHumidityOut()));
dto1401.setCnwd(String.valueOf(grain.getTempIn()));
--
Gitblit v1.9.3