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/ApiShServiceImpl1404.java | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
index bfa3aaa..0862f16 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.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.DrugLog;
import com.ld.igds.models.InteStatusLog;
@@ -11,6 +10,7 @@
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;
@@ -41,7 +41,6 @@
private InteStatusLogService inteStatusLogService;
@Autowired
private RedisUtil redisUtil;
-
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1404;
@@ -56,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1404);
- 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<DrugLog> dataList = hApiShServiceImpl.listDrugLog(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -79,31 +81,31 @@
//灏佽鏁版嵁淇℃伅
for (DrugLog data : dataList) {
dto = new Dto1404();
- dto.setXzzybm(data.getDepotId().substring(0, 25) + data.getId());
- dto.setCfdm(data.getDepotId().substring(0, 25));
- dto.setXzkssj(DateFormatUtils.format(data.getStart() == null ? (new Date()) : data.getStart(), "yyyy-MM-dd"));
- dto.setXzjssj(DateFormatUtils.format(data.getEnd() == null ? (new Date()) : data.getEnd(), "yyyy-MM-dd"));
- dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId()) ? "0" : data.getPestBatchId());
- dto.setDjcxz(data.getNum() == null ? "0" : data.getNum() + "");
- dto.setCgxzfs(StringUtils.isEmpty(data.getMode()) ? "0" : data.getMode());
- dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode()) ? "0" : data.getRecirMode());
- dto.setYjmc(StringUtils.isEmpty(data.getDrugName()) ? "0" : data.getDrugName());
- dto.setNd(data.getConcentration() == null ? "0" : data.getConcentration() + "");
- dto.setLddwyyl(data.getGrainDose() == null ? "0" : data.getGrainDose() + "");
- dto.setKjdwyyl(data.getSpaceDose() == null ? "0" : data.getSpaceDose() + "");
- dto.setZyyl(data.getDose() == null ? "0" : data.getDose() + "");
- dto.setSqrq(DateFormatUtils.format(data.getVentilateTime() == null ? (new Date()) : data.getVentilateTime(), "yyyy-MM-dd"));
- dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod()) ? "0" : data.getVentilateMethod());
- dto.setSqjsslhqnd(data.getAfterPh3() == null ? "0.0" : data.getAfterPh3() + "");
- dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate()) ? "0" : data.getEvaluate());
- dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff()) ? "0" : data.getCzsjff());
- dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs()) ? "0" : data.getCzclcs());
-// dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
+ dto.setXzzybm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25) + data.getId());
+ dto.setCfdm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25));
+ dto.setXzkssj(DateFormatUtils.format(data.getStart()==null?(new Date()):data.getStart(),"yyyy-MM-dd"));
+ dto.setXzjssj(DateFormatUtils.format(data.getEnd()==null?(new Date()):data.getEnd(),"yyyy-MM-dd"));
+ dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId())?"0":data.getPestBatchId());
+ dto.setDjcxz(data.getNum()==null?"0":data.getNum() + "");
+ dto.setCgxzfs(StringUtils.isEmpty(data.getMode())?"0":data.getMode());
+ dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode())?"0":data.getRecirMode());
+ dto.setYjmc(StringUtils.isEmpty(data.getDrugName())?"0":data.getDrugName());
+ dto.setNd(data.getConcentration()==null?"0":data.getConcentration() + "");
+ dto.setLddwyyl(data.getGrainDose()==null?"0":data.getGrainDose()+"");
+ dto.setKjdwyyl(data.getSpaceDose()==null?"0":data.getSpaceDose()+"");
+ dto.setZyyl(data.getDose()==null?"0":data.getDose()+"");
+ dto.setSqrq(DateFormatUtils.format(data.getVentilateTime()==null?(new Date()):data.getVentilateTime(),"yyyy-MM-dd"));
+ dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod())?"0":data.getVentilateMethod());
+ dto.setSqjsslhqnd(data.getAfterPh3()==null?"0.0":data.getAfterPh3() + "");
+ dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate())?"0":data.getEvaluate());
+ dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff())?"0":data.getCzsjff());
+ dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs())?"0":data.getCzclcs());
+ dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1404 + "_" + data.getId());
- if (null == log) {
+ if(null == log){
addLog = new InteStatusLog();
addLog.setBizId(ApiShConst.API_SH_1404 + "_" + data.getId());
addLog.setCompanyId(companyId);
@@ -113,7 +115,7 @@
addLog.setStatus(ApiShConst.API_SH_STATUS_SUCCESS);
inteStatusLogService.addInteStatusLog(addLog);
- } else {
+ }else {
dto.setCzbz(ApiShConst.API_SH_U);
}
list.add(dto);
--
Gitblit v1.9.3