From 9005fab8f1ef7b68557a670169331a17e74187d2 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 02 十一月 2023 16:08:46 +0800
Subject: [PATCH] 设备管理修改
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java
index a4e572b..6160009 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.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.Building;
import com.ld.igds.models.InteStatusLog;
@@ -56,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1403);
- 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<MAreationData> dataList = hApiShServiceImpl.listAreationData(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
--
Gitblit v1.9.3