From 1b9864a9b96efbf441a5f47ff1b815e39fd4fd0a Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 28 Apr 2023 16:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/majornetwork/Impl/EventAnalysisServiceImpl.java | 3 +-- .../njcn/executor/handler/DeviceAbnormalStatisticsJob.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index 5acb198da..5bb8a31df 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -1443,7 +1443,6 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { .ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime()))) ); - //获取字典属性 List reasonData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData(); Map reasonMap = reasonData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1)); @@ -1462,7 +1461,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { eventDetailNew.setFeatureAmplitude(eventDetail.getFeatureAmplitude()); //波形路径 eventDetailNew.setWavePath(eventDetail.getWavePath()); - if(data.getId().equals(eventDetail.getEventType())){ + if(data.getId().equals(eventDetail.getEventType())) { if (reasonMap.containsKey(eventDetail.getAdvanceReason())) { //暂降原因 DictData dictData = reasonMap.get(eventDetail.getAdvanceReason()); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java index 7b29cdc06..cb26a2036 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java @@ -7,7 +7,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @Slf4j @Component @@ -21,7 +21,7 @@ public class DeviceAbnormalStatisticsJob { @XxlJob("deviceAbnormalStatisticsJob") public void deviceAbnormalStatisticsJob () { - String time = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String time = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); log.info("执行日期deviceAbnormalStatisticsJob===============>"+time); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); param.setTime(time);