From 162f39543eca04ac0b4511ccb68e87f9cf62a344 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 26 Sep 2024 16:40:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=97=A0=E7=BA=BF=E8=AE=BEbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csdevice/service/impl/CsGroupServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index b5f543b..c1aab85 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -155,6 +155,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl getUnit(list,epdPqdList,groupList,dataLevel); //根据lineId获取监测点pt、ct变比 CsLinePO csLinePO = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData().get(0); + //获取测点模板 for (EnergyTemplateVO item : list) { EnergyTemplateVO vo = new EnergyTemplateVO(); BeanUtils.copyProperties(item,vo); @@ -307,11 +308,9 @@ public class CsGroupServiceImpl extends ServiceImpl impl commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency())); commonQueryParam.setPhasic(epdPqd.getPhase()); - commonQueryParam.setStartTime(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_PATTERN)); - commonQueryParam.setEndTime(DateUtil.format(DateUtil.date(), DatePattern.NORM_DATETIME_PATTERN)); - //commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime()); + commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(commonStatisticalQueryParam.getStartTime(),DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN)); + commonQueryParam.setEndTime(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(commonStatisticalQueryParam.getEndTime(),DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN)); - //commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime()); commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType()); commonQueryParam.setProcess(data1.get(0).getProcess()+""); commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));