From 85d6b843acb755706d48e33ef3ca5a27d3116729 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 7 Jul 2025 16:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/DataCleanServiceImpl.java | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java index 7b12594..5a7428e 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java @@ -51,7 +51,6 @@ import java.util.stream.Collectors; /** * @author xy */ -@Slf4j @Component @RequiredArgsConstructor public class DataCleanServiceImpl implements IDataCleanService { @@ -59,7 +58,7 @@ public class DataCleanServiceImpl implements IDataCleanService { private static final Logger logger = LoggerFactory.getLogger(DataCleanServiceImpl.class); private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); - + @Value("${line.num}") private Integer NUM = 100; @@ -148,7 +147,7 @@ public class DataCleanServiceImpl implements IDataCleanService { param.setEndTime(endTime); param.setDataType(false); - log.info("监测点：{},数据剔除初始时间:{},结束时间:{}", item.getMeasurementPointId(),startTime,endTime); + logger.info("监测点：{},数据剔除初始时间:{},结束时间:{}", item.getMeasurementPointId(),startTime,endTime); //修改dataV数据 List dataV = dataVFeignClient.getRawData(param).getData(); @@ -157,7 +156,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataVFeignClient.addInfluxDbList(dataV); - log.info("修改dataV数据量:{}", dataV.size()); + logger.info("修改dataV数据量:{}", dataV.size()); } //修改dataI数据 @@ -167,7 +166,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataIFeignClient.addInfluxDbList(dataI); - log.info("修改dataI数据量:{}", dataI.size()); + logger.info("修改dataI数据量:{}", dataI.size()); } //修改dataFlicker数据 @@ -177,7 +176,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataFlickerFeignClient.addInfluxDbList(dataFlicker); - log.info("修改dataFlicker数据量:{}", dataFlicker.size()); + logger.info("修改dataFlicker数据量:{}", dataFlicker.size()); } //修改dataFluc数据 @@ -187,7 +186,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataFlucFeignClient.addInfluxDbList(dataFluc); - log.info("修改dataFluc数据量:{}", dataFluc.size()); + logger.info("修改dataFluc数据量:{}", dataFluc.size()); } //修改dataHarmPhasicI数据 @@ -197,7 +196,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmphasicIFeignClient.addInfluxDbList(dataHarmI); - log.info("修改dataHarmI数据量:{}", dataHarmI.size()); + logger.info("修改dataHarmI数据量:{}", dataHarmI.size()); } //修改dataHarmPhasicV数据 @@ -207,7 +206,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmphasicVFeignClient.addInfluxDbList(DataHarmV); - log.info("修改dataHarmPhasicV数据量:{}", DataHarmV.size()); + logger.info("修改dataHarmPhasicV数据量:{}", DataHarmV.size()); } //修改dataHarmPowerP数据 @@ -217,7 +216,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmpowerPFeignClient.addInfluxDbList(dataPowerP); - log.info("dataHarmPowerP数据量:{}", dataPowerP.size()); + logger.info("dataHarmPowerP数据量:{}", dataPowerP.size()); } //修改dataHarmPowerQ数据 @@ -227,7 +226,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmpowerQFeignClient.addInfluxDbList(dataHarmPowerQ); - log.info("修改dataHarmPowerQ数据量:{}", dataHarmPowerQ.size()); + logger.info("修改dataHarmPowerQ数据量:{}", dataHarmPowerQ.size()); } //修改dataHarmPowerS数据 @@ -237,7 +236,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmpowerSFeignClient.addInfluxDbList(dataHarmPowerS); - log.info("修改dataHarmPowerS数据量:{}", dataHarmPowerS.size()); + logger.info("修改dataHarmPowerS数据量:{}", dataHarmPowerS.size()); } //修改dataHarmRateI数据 @@ -247,7 +246,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmRateIFeignClient.addInfluxDbList(dataHarmRateI); - log.info("修改dataHarmRateI数据量:{}", dataHarmRateI.size()); + logger.info("修改dataHarmRateI数据量:{}", dataHarmRateI.size()); } //修改dataHarmRateV数据 @@ -257,7 +256,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataHarmRateVFeignClient.addInfluxDbList(DataHarmRateV); - log.info("修改dataHarmRateV数据量:{}", DataHarmRateV.size()); + logger.info("修改dataHarmRateV数据量:{}", DataHarmRateV.size()); } //修改dataInHarmI数据 @@ -267,7 +266,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataInharmIFeignClient.addInfluxDbList(dataInHarmI); - log.info("修改dataInHarmI数据量:{}", dataInHarmI.size()); + logger.info("修改dataInHarmI数据量:{}", dataInHarmI.size()); } //修改dataInHarmV数据 @@ -277,7 +276,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataInharmVFeignClient.addInfluxDbList(dataInHarmV); - log.info("修改dataInHarmV数据量:{}", dataInHarmV.size()); + logger.info("修改dataInHarmV数据量:{}", dataInHarmV.size()); } //修改dataPlt数据 @@ -287,7 +286,7 @@ public class DataCleanServiceImpl implements IDataCleanService { item1.setAbnormalFlag(1); }); dataPltFeignClient.addInfluxDbList(dataPlt); - log.info("修改dataPlt数据量:{}", dataPlt.size()); + logger.info("修改dataPlt数据量:{}", dataPlt.size()); } }); } @@ -312,7 +311,7 @@ public class DataCleanServiceImpl implements IDataCleanService { lineDetail.forEach(item->{ List> resultData = new ArrayList<>(); - + Set allTimeSet = new HashSet<>(); PqDataVerifyBak bak = new PqDataVerifyBak(); bak.setLineId(item.getLineId()); bak.setTime(LocalDate.parse(calculatedParam.getDataDate(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); @@ -349,6 +348,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleDataV(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -368,6 +368,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleDataI(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -387,6 +388,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleDataPlt(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -406,6 +408,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleInHarmV(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -425,6 +428,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleHarmRateV(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -444,6 +448,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleHarmPowerP(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -463,6 +468,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleHarmPhasicV(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -482,6 +488,7 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleDataFluc(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } @@ -501,11 +508,19 @@ public class DataCleanServiceImpl implements IDataCleanService { Map dtoMap = handleDataFlicker(result,bak,item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); } } } + + if (CollUtil.isNotEmpty(allTimeSet)) { + Map dtoMap = new HashMap<>(); + dtoMap.put("lineErrorTimes",allTimeSet.size() * item.getTimeInterval()); + resultData.add(dtoMap); + } + if (CollUtil.isNotEmpty(resultData)) { bak.setState(1); //存储文件