From 938d98bd8ac038184d28d82a4183919932e32729 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 25 May 2023 08:26:24 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BF=9D=E7=95=99=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/main/service/impl/AnalyseDataServiceImpl.java | 2 ++ .../com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java index 476cdde..71fae0f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AnalyseDataServiceImpl.java @@ -65,6 +65,7 @@ public class AnalyseDataServiceImpl implements IAnalyseDataService { analyzeDataConditionPO.setFull(1); po.setDeviceCode(deviceCode); analyzeDataConditionPO.setSignages(signages); + analyzeDataConditionPO.setKeepFigures(2); analyzeDataConditionPO.setAccessRules(accessRules); analyzeDataConditionPO.setSaveTimeType(cycleType); // 间隔 @@ -101,6 +102,7 @@ public class AnalyseDataServiceImpl implements IAnalyseDataService { analyzeDataConditionPO.setFull(1); po.setDeviceCode(deviceCode); analyzeDataConditionPO.setSignages(signages); + analyzeDataConditionPO.setKeepFigures(2); analyzeDataConditionPO.setAccessRules(accessRules); analyzeDataConditionPO.setSaveTimeType(cycleType); // 间隔 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java index 83c7f71..c16822b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java @@ -748,7 +748,7 @@ public class WaterServiceImpl implements IWaterService { calendar.add(Calendar.MONTH, -calendar.get(Calendar.MONTH)); String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATE) + " 00:00:00"; // 查询数据 - List records = analyseDataService.periodTargetData(start,end,5,5,device.getEmCode(),HomePageConstant.HYDROPOWER_GENERATE_POWER); + List records = analyseDataService.periodTargetData(start,end,5,5,device.getEmCode(),HomePageConstant.ELECTRICITY_CONSUMPTION); if(CollectionUtil.isEmpty(records)){ return new HashMap<>(); }