Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

定时任务问题修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-28 16:28:33 +08:00
parent 33c9678661
commit 1b9864a9b9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -1443,7 +1443,6 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime()))) .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()))) .le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
); );
//获取字典属性 //获取字典属性
List<DictData> reasonData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData(); List<DictData> reasonData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData();
Map<String, DictData> reasonMap = reasonData.stream().collect(Collectors.toMap(DictData::getId, Function.identity(), (kye1, key2) -> kye1)); Map<String, DictData> 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.setFeatureAmplitude(eventDetail.getFeatureAmplitude());
//波形路径 //波形路径
eventDetailNew.setWavePath(eventDetail.getWavePath()); eventDetailNew.setWavePath(eventDetail.getWavePath());
if(data.getId().equals(eventDetail.getEventType())){ if(data.getId().equals(eventDetail.getEventType())) {
if (reasonMap.containsKey(eventDetail.getAdvanceReason())) { if (reasonMap.containsKey(eventDetail.getAdvanceReason())) {
//暂降原因 //暂降原因
DictData dictData = reasonMap.get(eventDetail.getAdvanceReason()); DictData dictData = reasonMap.get(eventDetail.getAdvanceReason());

4
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DeviceAbnormalStatisticsJob.java
View File

@@ -7,7 +7,7 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDate; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@Slf4j @Slf4j
@Component @Component
@@ -21,7 +21,7 @@ public class DeviceAbnormalStatisticsJob {
@XxlJob("deviceAbnormalStatisticsJob") @XxlJob("deviceAbnormalStatisticsJob")
public void 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); log.info("执行日期deviceAbnormalStatisticsJob===============>"+time);
DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam(); DeviceAbnormaStatisticsParam param =new DeviceAbnormaStatisticsParam();
param.setTime(time); param.setTime(time);