diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/MeasurementExecutor.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/MeasurementExecutor.java index 69c5f5c..99e7ed5 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/MeasurementExecutor.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/executor/MeasurementExecutor.java @@ -38,6 +38,19 @@ public class MeasurementExecutor extends BaseExecutor { @Resource private IPollutionService pollutionService; + /** + * 数据质量清洗 + */ + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataQualityClean", nodeType = NodeTypeEnum.COMMON) + public boolean dataQualityCleanAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataQualityClean", nodeType = NodeTypeEnum.COMMON) + public void dataQualityCleanProcess(NodeComponent bindCmp) { + dataCleanService.dataQualityCleanHandler(bindCmp.getRequestData()); + } + /** * 数据清洗 电压表 * dataV表 diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java index e7cdabe..b1d4cd8 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java @@ -7,6 +7,14 @@ import com.njcn.algorithm.pojo.bo.CalculatedParam; */ public interface IDataCleanService { + /** + * 数据质量清洗 + * 根据暂态事件发生的事件，将数据添加标签。 + * 获取暂态事件的时间，加上持续时间和统计间隔时间，作为剔除的起始和结束时间 + * @param calculatedParam + */ + void dataQualityCleanHandler(CalculatedParam calculatedParam); + /*** * dataV数据清洗 * 不标记原始数据，将异常数据查询出来重新存储至详情表中 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 0cb6738..721f418 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 @@ -6,6 +6,7 @@ import com.njcn.algorithm.pojo.bo.CalculatedParam; import com.njcn.algorithm.service.line.IDataCleanService; import com.njcn.algorithm.utils.MemorySizeUtil; import com.njcn.dataProcess.api.*; +import com.njcn.dataProcess.dto.*; import com.njcn.dataProcess.enums.DataCleanEnum; import com.njcn.dataProcess.param.DataCleanParam; import com.njcn.dataProcess.param.LineCountEvaluateParam; @@ -14,18 +15,25 @@ import com.njcn.dataProcess.pojo.po.PqDataVerify; import com.njcn.dataProcess.util.DataCommonUtils; import com.njcn.dataProcess.util.TimeUtils; import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.device.pq.pojo.vo.LineDetailVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Method; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -40,6 +48,8 @@ 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; @@ -52,10 +62,18 @@ public class DataCleanServiceImpl implements IDataCleanService { @Resource private DataInharmVFeignClient dataInharmVFeignClient; @Resource + private DataInharmIFeignClient dataInharmIFeignClient; + @Resource private DataHarmRateVFeignClient dataHarmRateVFeignClient; @Resource + private DataHarmRateIFeignClient dataHarmRateIFeignClient; + @Resource private DataHarmpowerPFeignClient dataHarmpowerPFeignClient; @Resource + private DataHarmpowerQFeignClient dataHarmpowerQFeignClient; + @Resource + private DataHarmpowerSFeignClient dataHarmpowerSFeignClient; + @Resource private DataHarmphasicVFeignClient dataHarmphasicVFeignClient; @Resource private DataFlucFeignClient dataFlucFeignClient; @@ -67,8 +85,251 @@ public class DataCleanServiceImpl implements IDataCleanService { private PqReasonableRangeFeignClient pqReasonableRangeFeignClient; @Resource private LineFeignClient lineFeignClient; + @Resource + private RmpEventDetailFeignClient rmpEventDetailFeignClient; + @Autowired + private DataHarmphasicIFeignClient dataHarmphasicIFeignClient; + @Override + @Transactional(rollbackFor = Exception.class) + public void dataQualityCleanHandler(CalculatedParam calculatedParam) { + MemorySizeUtil.getNowMemory(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); + logger.info("{},数据质量清洗算法执行=====》", LocalDateTime.now()); + //获取监测点的统计间隔 + List listOfString = (List) (List) calculatedParam.getIdList(); + List lineDetailDataVOS = lineFeignClient.getLineDetailList(listOfString).getData(); + if (CollUtil.isEmpty(lineDetailDataVOS)) { + logger.error("监测点集合为空，无法计算!"); + return; + } + Map lineMap = lineDetailDataVOS.stream().collect(Collectors.toMap(LineDetailDataVO::getLineId, Function.identity())); + + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setLineId(calculatedParam.getIdList()); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //获取监测点的暂态事件 + List eventList = rmpEventDetailFeignClient.getRawData(lineParam).getData(); + if (CollUtil.isNotEmpty(eventList)) { + eventList.forEach(item->{ + LineDetailDataVO vo = lineMap.get(item.getMeasurementPointId()); + //暂态事件时间 + LocalDateTime localDateTime = item.getStartTime(); + //暂态事件持续时间（秒转毫秒） + long lastTime = (long) (item.getDuration() * 1000); + //统计间隔 + Integer timeInterval = vo.getTimeInterval(); + //数据开始时间 + String startTime = localDateTime.format(formatter); + //数据结束时间 + long time = localDateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + lastTime + (timeInterval * 60 * 1000); + Instant instant = Instant.ofEpochMilli(time); + LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); + String endTime = dateTime.format(formatter); + + LineCountEvaluateParam param = new LineCountEvaluateParam(); + param.setLineId(Collections.singletonList(item.getMeasurementPointId())); + param.setStartTime(startTime); + param.setEndTime(endTime); + param.setDataType(false); + + log.info("监测点：{},数据剔除初始时间:{},结束时间:{}", item.getMeasurementPointId(),startTime,endTime); + + //修改dataV数据 + List dataV = dataVFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataV)) { + dataV.forEach(item1->{ + item1.setAbnormalFlag(1); + }); + dataVFeignClient.addInfluxDbList(dataV); + log.info("修改dataV数据量:{}", dataV.size()); + } + + //修改dataI数据 + List dataI = dataIFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataI)) { + dataI.forEach(item1->{ + item1.setAbnormalFlag(1); + }); + dataIFeignClient.addInfluxDbList(dataI); + log.info("修改dataI数据量:{}", dataI.size()); + } + + //修改dataFlicker数据 + List dataFlicker = dataFlickerFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataFlicker)) { + List dataFlickerDTOList = new ArrayList<>(); + dataFlicker.forEach(item1->{ + DataFlickerDTO dto = new DataFlickerDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataFlickerDTOList.add(dto); + }); + dataFlickerFeignClient.batchInsertion(dataFlickerDTOList); + log.info("修改dataFlicker数据量:{}", dataFlicker.size()); + } + + //修改dataFluc数据 + List dataFluc = dataFlucFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataFluc)) { + List dataFlucDTOList = new ArrayList<>(); + dataFluc.forEach(item1->{ + DataFlucDTO dto = new DataFlucDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataFlucDTOList.add(dto); + }); + dataFlucFeignClient.batchInsertion(dataFlucDTOList); + log.info("修改dataFluc数据量:{}", dataFluc.size()); + } + + //修改dataHarmPhasicI数据 + List dataHarmPhasicI = dataHarmphasicIFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataHarmPhasicI)) { + List dataHarmphasicIDTOList = new ArrayList<>(); + dataHarmPhasicI.forEach(item1->{ + DataHarmphasicIDTO dto = new DataHarmphasicIDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmphasicIDTOList.add(dto); + }); + dataHarmphasicIFeignClient.batchInsertion(dataHarmphasicIDTOList); + log.info("修改dataHarmPhasicI数据量:{}", dataHarmPhasicI.size()); + } + + //修改dataHarmPhasicV数据 + List DataHarmV = dataHarmphasicVFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(DataHarmV)) { + List dataHarmphasicVDTOList = new ArrayList<>(); + DataHarmV.forEach(item1->{ + DataHarmphasicVDTO dto = new DataHarmphasicVDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmphasicVDTOList.add(dto); + }); + dataHarmphasicVFeignClient.batchInsertion(dataHarmphasicVDTOList); + log.info("修改dataHarmPhasicV数据量:{}", DataHarmV.size()); + } + + //修改dataHarmPowerP数据 + List dataPowerP = dataHarmpowerPFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataPowerP)) { + List dataHarmpowerPDTOList = new ArrayList<>(); + dataPowerP.forEach(item1->{ + DataHarmpowerPDTO dto = new DataHarmpowerPDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmpowerPDTOList.add(dto); + }); + dataHarmpowerPFeignClient.batchInsertion(dataHarmpowerPDTOList); + log.info("修改 dataHarmPowerP数据量:{}", dataPowerP.size()); + } + + //修改dataHarmPowerQ数据 + List dataHarmPowerQ = dataHarmpowerQFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataHarmPowerQ)) { + List dataHarmpowerQDTOList = new ArrayList<>(); + dataHarmPowerQ.forEach(item1->{ + DataHarmpowerQDTO dto = new DataHarmpowerQDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmpowerQDTOList.add(dto); + }); + dataHarmpowerQFeignClient.batchInsertion(dataHarmpowerQDTOList); + log.info("修改dataHarmPowerQ数据量:{}", dataHarmPowerQ.size()); + } + + //修改dataHarmPowerS数据 + List dataHarmPowerS = dataHarmpowerSFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataHarmPowerS)) { + List dataHarmpowerSDTOList = new ArrayList<>(); + dataHarmPowerS.forEach(item1->{ + DataHarmpowerSDTO dto = new DataHarmpowerSDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmpowerSDTOList.add(dto); + }); + dataHarmpowerSFeignClient.batchInsertion(dataHarmpowerSDTOList); + log.info("修改dataHarmPowerS数据量:{}", dataHarmPowerS.size()); + } + + //修改dataHarmRateI数据 + List dataHarmRateI = dataHarmRateIFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataHarmRateI)) { + dataHarmRateI.forEach(item1->{ + item1.setAbnormalFlag(1); + }); + dataHarmRateIFeignClient.addInfluxDbList(dataHarmRateI); + log.info("修改dataHarmRateI数据量:{}", dataHarmRateI.size()); + } + + //修改dataHarmRateV数据 + List DataHarmRateV = dataHarmRateVFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(DataHarmRateV)) { + List dataHarmrateVDTOList = new ArrayList<>(); + DataHarmRateV.forEach(item1->{ + DataHarmrateVDTO dto = new DataHarmrateVDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataHarmrateVDTOList.add(dto); + }); + dataHarmRateVFeignClient.batchInsertion(dataHarmrateVDTOList); + log.info("修改dataHarmRateV数据量:{}", DataHarmRateV.size()); + } + + //修改dataInHarmI数据 + List dataInHarmI = dataHarmRateIFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataInHarmI)) { + dataInHarmI.forEach(item1->{ + item1.setAbnormalFlag(1); + }); + dataHarmRateIFeignClient.addInfluxDbList(dataInHarmI); + log.info("修改dataHarmRateI数据量:{}", dataInHarmI.size()); + } + + //修改dataInHarmV数据 + List dataInHarmV = dataInharmVFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataInHarmV)) { + List dataInharmVDTOList = new ArrayList<>(); + dataInHarmV.forEach(item1->{ + DataInharmVDTO dto = new DataInharmVDTO(); + BeanUtils.copyProperties(item1,dto); + dto.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + dto.setAbnormalFlag(1); + dataInharmVDTOList.add(dto); + }); + dataInharmVFeignClient.batchInsertion(dataInharmVDTOList); + log.info("修改dataInHarmV数据量:{}", dataInHarmV.size()); + } + + //修改dataPlt数据 + List dataPlt = dataPltFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataPlt)) { + List dataPltDTOList = new ArrayList<>(); + dataPlt.forEach(item1->{ + DataPltDTO pltDTO = new DataPltDTO(); + BeanUtils.copyProperties(item1,pltDTO); + pltDTO.setTimeid(LocalDateTime.parse(item1.getMinTime(), DATE_TIME_FORMATTER)); + pltDTO.setAbnormalFlag(1); + dataPltDTOList.add(pltDTO); + }); + dataPltFeignClient.batchInsertion(dataPltDTOList); + log.info("修改dataPlt数据量:{}", dataPlt.size()); + } + }); + } + } + @Override public void dataVCleanHandler(CalculatedParam calculatedParam) { MemorySizeUtil.getNowMemory(); diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/utils/MemorySizeUtil.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/utils/MemorySizeUtil.java index 2a6173b..0556025 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/utils/MemorySizeUtil.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/utils/MemorySizeUtil.java @@ -1,9 +1,7 @@ package com.njcn.algorithm.utils; import org.apache.commons.lang.SerializationUtils; -import org.springframework.stereotype.Component; -import java.lang.instrument.Instrumentation; import java.time.LocalDateTime; import java.util.List; @@ -39,3 +37,4 @@ public class MemorySizeUtil { } } + diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateIFeignClient.java index c74ce38..f68b61f 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateIFeignClient.java @@ -1,11 +1,17 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataHarmRateIFeignClientFallbackFactory; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,4 +30,10 @@ public interface DataHarmRateIFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List list); + @PostMapping("/getRawData") + HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List dataIList); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java index 5c30534..8680fe6 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java @@ -1,12 +1,19 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataHarmRateVFeignClientFallbackFactory; +import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -33,4 +40,7 @@ public interface DataHarmRateVFeignClient { @PostMapping("/getHarmRateVData") HttpResult> getHarmRateVData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/batchInsertion") + HttpResult batchInsertion(@RequestBody List dataHarmrateVDTOList); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java index 2115c08..b9a1653 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicIFeignClient.java @@ -1,14 +1,20 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataHarmphasicIFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlucDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,4 +38,7 @@ public interface DataHarmphasicIFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + @PostMapping("/getRawData") + HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java index 4e7235e..75d9e63 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerQFeignClient.java @@ -1,12 +1,18 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataHarmpowerQFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataHarmpowerQDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,4 +38,7 @@ public interface DataHarmpowerQFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + @PostMapping("/getRawData") + HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java index 7e2097e..76fab5d 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerSFeignClient.java @@ -1,12 +1,18 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataIFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataHarmpowerSDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerSDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,4 +38,7 @@ public interface DataHarmpowerSFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + @PostMapping("/getRawData") + HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java index 74b01c5..47ba20c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java @@ -1,12 +1,18 @@ package com.njcn.dataProcess.api; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataIFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -35,4 +41,7 @@ public interface DataIFeignClient { @PostMapping("/getDataI") HttpResult> getDataI(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List dataIList); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java index 2e6911b..5e0faf6 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmIFeignClient.java @@ -2,12 +2,10 @@ package com.njcn.dataProcess.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; - import com.njcn.dataProcess.api.fallback.DataInharmIFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataInharmIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; import com.njcn.dataProcess.pojo.dto.DataInHarmIDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -32,4 +30,7 @@ public interface DataInharmIFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List list); + @PostMapping("/getRawData") + HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java index e9115cb..05a1de0 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataInharmVFeignClient.java @@ -24,8 +24,6 @@ import java.util.List; @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataInharmV", fallbackFactory = DataInharmVFeignClientFallbackFactory.class, contextId = "dataInharmV") public interface DataInharmVFeignClient { - - @PostMapping("/batchInsertion") HttpResult batchInsertion(@RequestBody List dataInharmVDTOList); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateIFeignClientFallbackFactory.java index ee6d32e..ac19805 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateIFeignClientFallbackFactory.java @@ -50,6 +50,18 @@ public class DataHarmRateIFeignClientFallbackFactory implements FallbackFactory< throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getRawData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addInfluxDbList(List dataIList) { + log.error("{}异常，降级处理，异常为：{}","influxdb数据插入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java index 18d817a..7f1fc99 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java @@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmRateVFeignClient; +import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; @@ -67,6 +68,12 @@ public class DataHarmRateVFeignClientFallbackFactory implements FallbackFactory< throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult batchInsertion(List dataHarmrateVDTOList) { + log.error("{}异常，降级处理，异常为：{}","谐波含有率数据批量插入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java index 5912783..2dc8179 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicIFeignClientFallbackFactory.java @@ -59,6 +59,12 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getRawData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java index 7ddc8be..847a7b2 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerQFeignClientFallbackFactory.java @@ -58,6 +58,12 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getRawData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java index a293624..e37d695 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerSFeignClientFallbackFactory.java @@ -59,6 +59,12 @@ public class DataHarmpowerSFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getRawData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","harmPowerS获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java index c207748..2582075 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java @@ -70,6 +70,12 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List dataIList) { + log.error("{}异常，降级处理，异常为：{}","dataI时序数据库插入数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java index 31b952d..a8b3cab 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java @@ -59,6 +59,12 @@ public class DataInharmIFeignClientFallbackFactory implements FallbackFactory> getRawData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlickerDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlickerDTO.java index 2cbea4b..6026416 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlickerDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlickerDTO.java @@ -35,6 +35,7 @@ public class DataFlickerDTO implements Serializable{ private Double pst; private Double plt; private Integer qualityflag; + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlucDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlucDTO.java index 6adc1e2..c74fa7a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlucDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataFlucDTO.java @@ -34,6 +34,6 @@ public class DataFlucDTO implements Serializable{ private Double fluc; private Double fluccf; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicIDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicIDTO.java index dfdca70..a640ecf 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicIDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicIDTO.java @@ -232,6 +232,6 @@ public class DataHarmphasicIDTO implements Serializable{ private Double i49Cp95; private Double i50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicVDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicVDTO.java index 6126a89..5339889 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicVDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmphasicVDTO.java @@ -232,6 +232,7 @@ public class DataHarmphasicVDTO implements Serializable{ private Double v49Cp95; private Double v50Cp95; private Integer qualityflag; + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerPDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerPDTO.java index 248fb22..1b4d61f 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerPDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerPDTO.java @@ -243,6 +243,6 @@ public class DataHarmpowerPDTO implements Serializable { private Double p49Cp95; private Double p50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerQDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerQDTO.java index 1a57293..cd04070 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerQDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerQDTO.java @@ -236,6 +236,6 @@ public class DataHarmpowerQDTO implements Serializable { private Double q49Cp95; private Double q50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerSDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerSDTO.java index ea1fd82..993680c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerSDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmpowerSDTO.java @@ -237,6 +237,6 @@ public class DataHarmpowerSDTO implements Serializable { private Double s49Cp95; private Double s50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmrateVDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmrateVDTO.java index 7bae03e..351c548 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmrateVDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataHarmrateVDTO.java @@ -232,6 +232,6 @@ public class DataHarmrateVDTO implements Serializable{ private Double v49Cp95; private Double v50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataInharmVDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataInharmVDTO.java index e40fe8f..87317cb 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataInharmVDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataInharmVDTO.java @@ -232,6 +232,6 @@ public class DataInharmVDTO implements Serializable{ private Double v49Cp95; private Double v50Cp95; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataPltDTO.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataPltDTO.java index e1453fa..a23c635 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataPltDTO.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataPltDTO.java @@ -32,6 +32,6 @@ public class DataPltDTO implements Serializable { private String phasicType; private Double plt; private Integer qualityflag; - + private Integer abnormalFlag; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/param/LineCountEvaluateParam.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/param/LineCountEvaluateParam.java index 75db21e..cc2b062 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/param/LineCountEvaluateParam.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/param/LineCountEvaluateParam.java @@ -57,5 +57,10 @@ public class LineCountEvaluateParam extends BaseParam implements Serializable { */ private String lt; + /** + * 数据类型 判断获取数据是否排除暂态异常数据 + */ + private Boolean dataType = true; + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java index a67e988..ef80990 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java @@ -45,6 +45,9 @@ public class DataFlicker { @Column(name = "quality_flag",tag = true) private String qualityFlag ="0"; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; public static DataFlicker relationToInfluxDB(DataFlickerDTO dataFlicker) { if (dataFlicker == null) { @@ -61,7 +64,7 @@ public class DataFlicker { influxDBDataFlicker.setPlt(Objects.isNull(dataFlicker.getPlt())?0.00:dataFlicker.getPlt()); influxDBDataFlicker.setPst(Objects.isNull(dataFlicker.getPst())?0.00:dataFlicker.getPst()); influxDBDataFlicker.setQualityFlag(dataFlicker.getQualityflag()+""); - + influxDBDataFlicker.setAbnormalFlag(dataFlicker.getAbnormalFlag()); return influxDBDataFlicker; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java index f63d0fa..19baed1 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java @@ -39,10 +39,13 @@ public class DataFluc { @Column(name = "fluccf") private Double fluccf=0.00; - @Column(name = "quality_flag",tag = true) private String qualityFlag="0"; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + public static DataFluc relationToInfluxDB(DataFlucDTO dataFluc) { if (dataFluc == null) { return null; @@ -57,7 +60,7 @@ public class DataFluc { influxDBDataFluc.setFluc(Objects.isNull(dataFluc.getFluc())?0.00:dataFluc.getFluc()); influxDBDataFluc.setFluccf(Objects.isNull(dataFluc.getFluccf())?0.00:dataFluc.getFluccf()); influxDBDataFluc.setQualityFlag(dataFluc.getQualityflag()+""); - + influxDBDataFluc.setAbnormalFlag(dataFluc.getAbnormalFlag()); return influxDBDataFluc; } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java index a3fe296..4afe4b7 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java @@ -43,6 +43,10 @@ public class DataHarmphasicI { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "i_1") private Double i1; @@ -209,6 +213,7 @@ public class DataHarmphasicI { influxDBDataHarmPhasicI.setPhasicType(dataHarmphasicI.getPhasicType()); influxDBDataHarmPhasicI.setQualityFlag(dataHarmphasicI.getQualityflag()+""); influxDBDataHarmPhasicI.setValueType(valueType); + influxDBDataHarmPhasicI.setAbnormalFlag(dataHarmphasicI.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataHarmPhasicI.setI1(Objects.isNull(dataHarmphasicI.getI1())?0.00:dataHarmphasicI.getI1()); influxDBDataHarmPhasicI.setI2(Objects.isNull(dataHarmphasicI.getI2())?0.00:dataHarmphasicI.getI2()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java index 36320cc..6a9f5b6 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java @@ -44,6 +44,10 @@ public class DataHarmphasicV { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "v_1") private Double v1; @@ -209,6 +213,7 @@ public class DataHarmphasicV { InfluxDBDataHarmphasicV.setPhasicType(dataHarmphasicV.getPhasicType()); InfluxDBDataHarmphasicV.setQualityFlag(dataHarmphasicV.getQualityflag()+""); InfluxDBDataHarmphasicV.setValueType(valueType); + InfluxDBDataHarmphasicV.setAbnormalFlag(dataHarmphasicV.getAbnormalFlag()); if (valueType.equals("AVG")) { InfluxDBDataHarmphasicV.setV1(Objects.isNull(dataHarmphasicV.getV1())?0.00:dataHarmphasicV.getV1()); InfluxDBDataHarmphasicV.setV2(Objects.isNull(dataHarmphasicV.getV2())?0.00:dataHarmphasicV.getV2()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java index f9f124c..c88c49a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java @@ -44,6 +44,10 @@ public class DataHarmpowerP { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "df") private Double df; @@ -218,6 +222,7 @@ public class DataHarmpowerP { influxDBDataHarmpowerP.setPhasicType(dataHarmpowerP.getPhasicType()); influxDBDataHarmpowerP.setQualityFlag(dataHarmpowerP.getQualityflag()+""); influxDBDataHarmpowerP.setValueType(valueType); + influxDBDataHarmpowerP.setAbnormalFlag(dataHarmpowerP.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDf()); influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPf()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java index ea9274b..1d1019b 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java @@ -44,6 +44,10 @@ public class DataHarmpowerQ { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "q") private Double q; @@ -212,6 +216,7 @@ public class DataHarmpowerQ { influxDBDataHarmpowerQ.setPhasicType(dataHarmpowerQ.getPhasicType()); influxDBDataHarmpowerQ.setQualityFlag(dataHarmpowerQ.getQualityflag()+""); influxDBDataHarmpowerQ.setValueType(valueType); + influxDBDataHarmpowerQ.setAbnormalFlag(dataHarmpowerQ.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQ()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java index a8e1503..67524c9 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java @@ -44,6 +44,10 @@ public class DataHarmpowerS { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "s") private Double s; @@ -212,6 +216,7 @@ public class DataHarmpowerS { influxDBDataHarmpowerS.setPhasicType(dataHarmpowerS.getPhasicType()); influxDBDataHarmpowerS.setQualityFlag(dataHarmpowerS.getQualityflag()+""); influxDBDataHarmpowerS.setValueType(valueType); + influxDBDataHarmpowerS.setAbnormalFlag(dataHarmpowerS.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getS()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java index 18627ed..f185a3f 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java @@ -43,6 +43,10 @@ public class DataHarmrateI { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "i_1") private Double i1; diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java index a3aeb35..ef3a888 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java @@ -43,6 +43,10 @@ public class DataHarmrateV { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "v_1") private Double v1; @@ -208,6 +212,7 @@ public class DataHarmrateV { influxDBDataHarmRateV.setPhasicType(dataHarmrateV.getPhasicType()); influxDBDataHarmRateV.setQualityFlag(dataHarmrateV.getQualityflag()+""); influxDBDataHarmRateV.setValueType(valueType); + influxDBDataHarmRateV.setAbnormalFlag(dataHarmrateV.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataHarmRateV.setV1(Objects.isNull(dataHarmrateV.getV1())?0.00:dataHarmrateV.getV1()); influxDBDataHarmRateV.setV2(Objects.isNull(dataHarmrateV.getV2())?0.00:dataHarmrateV.getV2()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java index ff8d688..1d7e425 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java @@ -44,6 +44,10 @@ public class DataI { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "i_neg") private Double iNeg; diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java index a91ab36..97a43ee 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java @@ -44,6 +44,10 @@ public class DataInharmI { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "i_1") private Double i1; diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java index 6fa3565..0e7b3b2 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java @@ -44,6 +44,10 @@ public class DataInharmV { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "v_1") private Double v1; @@ -209,6 +213,7 @@ public class DataInharmV { influxDBDataInHarmV.setPhasicType(dataInharmV.getPhasicType()); influxDBDataInHarmV.setQualityFlag(dataInharmV.getQualityflag()+""); influxDBDataInHarmV.setValueType(valueType); + influxDBDataInHarmV.setAbnormalFlag(dataInharmV.getAbnormalFlag()); if (valueType.equals("AVG")) { influxDBDataInHarmV.setV1(Objects.isNull(dataInharmV.getV1())?0.00:dataInharmV.getV1()); influxDBDataInHarmV.setV2(Objects.isNull(dataInharmV.getV2())?0.00:dataInharmV.getV2()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java index 6ab88d1..15fa0c8 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java @@ -37,6 +37,10 @@ public class DataPlt { @Column(name = "quality_flag",tag = true) private String qualityFlag="0"; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + @Column(name = "plt") private Double plt; @@ -53,7 +57,7 @@ public class DataPlt { influxDBDataPlt.setPhasicType(dataPlt.getPhasicType()); influxDBDataPlt.setPlt(Objects.isNull(dataPlt.getPlt())?0.00:dataPlt.getPlt()); influxDBDataPlt.setQualityFlag(dataPlt.getQualityflag()+""); - + influxDBDataPlt.setAbnormalFlag(dataPlt.getAbnormalFlag()); return influxDBDataPlt; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateIController.java index 5f6cc48..b5b60e9 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateIController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateIController.java @@ -12,6 +12,7 @@ import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerSDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; +import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.service.IDataHarmRateI; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -45,6 +46,15 @@ public class DataHarmRateIController extends BaseController { @InsertBean private IDataHarmRateI dataHarmRateIInsert; + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getRawData") + @ApiOperation("获取原始数据") + public HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getRawData"); + List data = dataHarmRateIQuery.getRawData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getBaseData") @ApiOperation("获取算法基础数据") @@ -63,4 +73,13 @@ public class DataHarmRateIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List dataIList) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmRateIQuery.addInfluxDbList(dataIList); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java index 0367c39..d814816 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicIController.java @@ -11,6 +11,7 @@ import com.njcn.dataProcess.annotation.QueryBean; import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; import com.njcn.dataProcess.service.IDataHarmphasicI; import com.njcn.web.controller.BaseController; @@ -56,6 +57,15 @@ public class DataHarmphasicIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getRawData") + @ApiOperation("获取原始数据") + public HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getRawData"); + List data = dataHarmphasicIQuery.getRawData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getBaseData") @ApiOperation("获取算法基础数据") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java index f486cb2..0a78443 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerQController.java @@ -6,12 +6,11 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.dataProcess.dto.DataHarmpowerQDTO; import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; +import com.njcn.dataProcess.dto.DataHarmpowerQDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; import com.njcn.dataProcess.service.IDataHarmpowerQ; import com.njcn.web.controller.BaseController; @@ -57,6 +56,15 @@ public class DataHarmpowerQController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getRawData") + @ApiOperation("获取原始数据") + public HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getRawData"); + List data = dataHarmpowerQQuery.getRawData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getBaseData") @ApiOperation("获取算法基础数据") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java index 49aae0d..c50b775 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerSController.java @@ -56,6 +56,15 @@ public class DataHarmpowerSController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getRawData") + @ApiOperation("获取原始数据") + public HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getRawData"); + List data = dataHarmpowerSQuery.getRawData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getBaseData") @ApiOperation("获取算法基础数据") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java index 154c2fe..5ad9135 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataIController.java @@ -83,6 +83,15 @@ public class DataIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List dataIList) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataIQuery.addInfluxDbList(dataIList); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDataI") @ApiOperation("获取谐波电流") @@ -92,6 +101,4 @@ public class DataIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataIDtoList, methodDescribe); } - - } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java index 41ba879..2caea46 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmIController.java @@ -11,6 +11,7 @@ import com.njcn.dataProcess.annotation.QueryBean; import com.njcn.dataProcess.dto.DataInharmIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; import com.njcn.dataProcess.pojo.dto.DataInHarmIDto; import com.njcn.dataProcess.service.IDataInharmI; import com.njcn.web.controller.BaseController; @@ -56,6 +57,15 @@ public class DataInharmIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getRawData") + @ApiOperation("获取原始数据") + public HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getRawData"); + List data = dataInharmIQuery.getRawData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getBaseData") @ApiOperation("获取算法基础数据") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java index 301f96c..97455ca 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataPltController.java @@ -52,7 +52,7 @@ public class DataPltController extends BaseController { public HttpResult batchInsertion(@RequestBody List dataPltDTOList) { String methodDescribe = getMethodDescribe("batchInsertion"); - dataPltInsert.batchInsertion(dataPltDTOList); + dataPltQuery.batchInsertion(dataPltDTOList); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java index 096bf39..d1330de 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java @@ -136,15 +136,12 @@ public class DataVController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @PostMapping("/addInfluxDbList") @ApiOperation("时序数据库插入数据") - @Deprecated public HttpResult addInfluxDbList(@RequestBody List dataVList) { String methodDescribe = getMethodDescribe("addInfluxDbList"); dataVQuery.addInfluxDbList(dataVList); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getMeasurementCount") @ApiOperation("获取算法基础数据") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateI.java index 09eeb99..7010e7a 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateI.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateI.java @@ -4,6 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; +import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmRateID; import java.util.List; @@ -13,6 +14,13 @@ import java.util.List; */ public interface IDataHarmRateI extends IMppService { + /** + * 获取原始数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + /** * 获取预处理数据 * @param lineParam 监测点参数 @@ -24,4 +32,6 @@ public interface IDataHarmRateI extends IMppService { */ void addList(List list); + void addInfluxDbList(List dataIList); + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java index 508698e..bd072bf 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicI.java @@ -4,6 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; @@ -17,8 +18,16 @@ import java.util.List; * @version V1.0.0 */ public interface IDataHarmphasicI extends IMppService { + void batchInsertion(List dataIDTOList); + /** + * 获取原始数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + /** * 获取监测点原始数据 * @param lineParam 监测点参数 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java index 5b3b115..88be2a4 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerQ.java @@ -17,8 +17,16 @@ import java.util.List; * @version V1.0.0 */ public interface IDataHarmpowerQ extends IMppService { + void batchInsertion(List dataIDTOList); + /** + * 获取原始数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + /** * 获取预处理数据 * @param lineParam 监测点参数 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java index 9da3c56..6b4a979 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerS.java @@ -4,6 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.dto.DataHarmpowerSDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerSDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerSD; @@ -17,8 +18,16 @@ import java.util.List; * @version V1.0.0 */ public interface IDataHarmpowerS extends IMppService { + void batchInsertion(List dataIDTOList); + /** + * 获取原始数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + /** * 获取预处理数据 * @param lineParam 监测点参数 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java index 4dc1f0f..6425897 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java @@ -5,6 +5,7 @@ import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.dto.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataID; import com.njcn.dataProcess.pojo.po.RStatDataVD; @@ -39,6 +40,7 @@ public interface IDataI extends IMppService { */ void addList(List dataIDtoList); + void addInfluxDbList(List dataIList); /** * 获取谐波电流 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java index b051d9e..d806188 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmI.java @@ -4,6 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.dto.DataInharmIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; import com.njcn.dataProcess.pojo.dto.DataInHarmIDto; import com.njcn.dataProcess.pojo.po.RStatDataInHarmID; @@ -20,6 +21,13 @@ public interface IDataInharmI extends IMppService { void batchInsertion(List dataIDTOList); + /** + * 获取原始数据 + * @param lineParam + * @return + */ + List getRawData(LineCountEvaluateParam lineParam); + /** * 获取预处理数据 * @param lineParam 监测点参数 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java index 58ae2f5..73244f9 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java @@ -9,6 +9,7 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlickerRelationMapper; import com.njcn.dataProcess.dto.DataFlickerDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataFlicker; +import com.njcn.dataProcess.po.influx.DataHarmphasicI; import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlickerDto; @@ -23,10 +24,7 @@ import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -163,35 +161,44 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) { + List dataList; List list = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataFlicker::getLineId)); - //有异常数据 - Map> timeMap = lineParam.getAbnormalTime(); - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k, v) -> { - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if (CollUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataFlicker::getLineId)); + //有异常数据 + Map> timeMap = lineParam.getAbnormalTime(); + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k, v) -> { + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } } @@ -213,6 +220,7 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime()); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType()); list.forEach(item->{ DataFlucDto dto = new DataFlucDto(); BeanUtils.copyProperties(item,dto); @@ -77,7 +74,7 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(dataIList)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -129,7 +126,8 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFluc.class); influxQueryWrapper.regular(DataFluc::getLineId, lineList) @@ -138,36 +136,45 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl list = dataFlucMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataFluc::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if (CollectionUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataFluc::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java index 175c0a5..df52831 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -7,22 +8,24 @@ import com.njcn.dataProcess.dao.imapper.DataHarmRateIMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateIRelationMapper; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmrateI; +import com.njcn.dataProcess.po.influx.DataHarmrateV; +import com.njcn.dataProcess.po.influx.DataI; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; +import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmRateID; import com.njcn.dataProcess.service.IDataHarmRateI; import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -35,10 +38,23 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); + list.forEach(item->{ + DataHarmRateIDto dto = new DataHarmRateIDto(); + BeanUtils.copyProperties(item,dto); + dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime())); + result.add(dto); + }); + return result; + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -136,6 +152,18 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl dataIList) { + List result = new ArrayList<>(); + dataIList.forEach(item -> { + DataHarmrateI dataI = new DataHarmrateI(); + BeanUtils.copyProperties(item, dataI); + dataI.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataI); + }); + dataHarmRateIMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 @@ -144,7 +172,8 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateI.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -153,36 +182,45 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl list = dataHarmRateIMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmrateI::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmrateI::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java index 5fe9127..094f4f8 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java @@ -9,6 +9,7 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateVRelationMapper import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmrateV; +import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; @@ -203,6 +204,7 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl getMinuteData(LineCountEvaluateParam lineParam) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -211,39 +213,48 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl list = dataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmrateV::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { - lineMap.forEach((k,v)->{ - List timeList = lineParam.getAbnormalTime().get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmrateV::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { + lineMap.forEach((k,v)->{ + List timeList = lineParam.getAbnormalTime().get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java index 7b36c65..3134a9f 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -8,7 +9,9 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicIRelationMapp import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmphasicI; +import com.njcn.dataProcess.po.influx.DataHarmphasicV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import com.njcn.dataProcess.service.IDataHarmphasicI; @@ -17,14 +20,12 @@ import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -60,10 +61,23 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType()); + list.forEach(item->{ + DataHarmPhasicIDto dto = new DataHarmPhasicIDto(); + BeanUtils.copyProperties(item,dto); + dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime())); + result.add(dto); + }); + return result; + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -169,7 +183,8 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap,Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -178,36 +193,45 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl list = dataHarmphasicIMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmphasicI::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmphasicI::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java index ee80f92..d83f633 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -9,6 +10,7 @@ import com.njcn.dataProcess.dto.DataHarmphasicVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmphasicI; import com.njcn.dataProcess.po.influx.DataHarmphasicV; +import com.njcn.dataProcess.po.influx.DataHarmpowerS; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto; @@ -65,7 +67,7 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime()); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType()); list.forEach(item->{ DataHarmDto dto = new DataHarmDto(); BeanUtils.copyProperties(item,dto); @@ -78,7 +80,7 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -184,7 +186,8 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -193,36 +196,45 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl list = dataHarmphasicVMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmphasicV::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmphasicV::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java index e5630a1..27dfc0c 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -9,6 +10,7 @@ import com.njcn.dataProcess.dto.DataHarmpowerPDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmphasicV; import com.njcn.dataProcess.po.influx.DataHarmpowerP; +import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; @@ -64,7 +66,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime()); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(), lineParam.getDataType()); list.forEach(item->{ DataPowerPDto dto = new DataPowerPDto(); BeanUtils.copyProperties(item,dto); @@ -77,7 +79,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(), lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -187,7 +189,8 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -199,36 +202,45 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl list = dataHarmpowerPMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmpowerP::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if (CollUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmpowerP::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java index 7458572..2565401 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -7,8 +8,9 @@ import com.njcn.dataProcess.dao.imapper.DataHarmpowerQMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerQRelationMapper; import com.njcn.dataProcess.dto.DataHarmpowerQDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.po.influx.DataHarmpowerP; +import com.njcn.dataProcess.po.influx.DataHarmphasicV; import com.njcn.dataProcess.po.influx.DataHarmpowerQ; +import com.njcn.dataProcess.po.influx.DataHarmrateI; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD; @@ -18,6 +20,7 @@ import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.ZoneId; @@ -58,10 +61,23 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType()); + list.forEach(item->{ + DataHarmPowerQDto dto = new DataHarmPowerQDto(); + BeanUtils.copyProperties(item,dto); + dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime())); + result.add(dto); + }); + return result; + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -169,7 +185,8 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -179,36 +196,45 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl list = dataHarmpowerQMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmpowerQ::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmpowerQ::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java index a9f7084..9f9c88b 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -7,8 +8,10 @@ import com.njcn.dataProcess.dao.imapper.DataHarmpowerSMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerSRelationMapper; import com.njcn.dataProcess.dto.DataHarmpowerSDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; +import com.njcn.dataProcess.po.influx.DataHarmpowerQ; import com.njcn.dataProcess.po.influx.DataHarmpowerS; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerSDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerSD; import com.njcn.dataProcess.service.IDataHarmpowerS; @@ -17,14 +20,12 @@ import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -60,10 +61,23 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType()); + list.forEach(item->{ + DataHarmPowerSDto dto = new DataHarmPowerSDto(); + BeanUtils.copyProperties(item,dto); + dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime())); + result.add(dto); + }); + return result; + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -171,7 +185,8 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap,Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -181,36 +196,45 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl list = dataHarmpowerSMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmpowerS::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)) { + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataHarmpowerS::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java index 763a04f..71af2f7 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java @@ -9,6 +9,7 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataIRelationMapper; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataI; +import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataID; @@ -21,6 +22,7 @@ import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; @@ -182,6 +184,18 @@ public class InfluxdbDataIImpl extends MppServiceImpl dataIList) { + List result = new ArrayList<>(); + dataIList.forEach(item -> { + DataI dataI = new DataI(); + BeanUtils.copyProperties(item, dataI); + dataI.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataI); + }); + dataIMapper.insertBatch(result); + } + @Override public List getDataI(LineCountEvaluateParam lineParam) { return Collections.emptyList(); @@ -196,6 +210,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl getMinuteDataI(LineCountEvaluateParam lineParam) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -210,39 +225,48 @@ public class InfluxdbDataIImpl extends MppServiceImpl list = dataIMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataI::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { - lineMap.forEach((k,v)->{ - List timeList = lineParam.getAbnormalTime().get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataI::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { + lineMap.forEach((k,v)->{ + List timeList = lineParam.getAbnormalTime().get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java index 3593a41..a4d8823 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java @@ -1,5 +1,6 @@ package com.njcn.dataProcess.service.impl.influxdb; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; @@ -8,6 +9,7 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataInHarmIRelationMapper; import com.njcn.dataProcess.dto.DataInharmIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataInharmI; +import com.njcn.dataProcess.po.influx.DataInharmV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataInHarmIDto; import com.njcn.dataProcess.pojo.po.RStatDataInHarmID; @@ -17,14 +19,12 @@ import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -60,10 +60,23 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); + list.forEach(item->{ + DataInHarmIDto dto = new DataInHarmIDto(); + BeanUtils.copyProperties(item,dto); + dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime())); + result.add(dto); + }); + return result; + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); - List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType()); if (CollectionUtil.isNotEmpty(data)) { String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); //以监测点分组 @@ -169,7 +182,8 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap, Boolean dataType) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmI.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -178,36 +192,45 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl list = dataInharmIMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataInharmI::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k,v)->{ - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (dataType) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataInharmI::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k,v)->{ + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java index c9192fe..4ecad13 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java @@ -10,6 +10,7 @@ import com.njcn.dataProcess.dto.DataInharmVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataI; import com.njcn.dataProcess.po.influx.DataInharmV; +import com.njcn.dataProcess.po.influx.DataPlt; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataInHarmVDto; @@ -25,10 +26,7 @@ import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -189,6 +187,7 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl getMinuteData(LineCountEvaluateParam lineParam) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmV.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); @@ -197,39 +196,48 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl list = dataInharmVMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataInharmV::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { - lineMap.forEach((k,v)->{ - List timeList = lineParam.getAbnormalTime().get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataInharmV::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { + lineMap.forEach((k,v)->{ + List timeList = lineParam.getAbnormalTime().get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java index 5505351..e7df303 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java @@ -7,6 +7,7 @@ import com.njcn.dataProcess.dao.imapper.DataPltMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataPltRelationMapper; import com.njcn.dataProcess.dto.DataPltDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; +import com.njcn.dataProcess.po.influx.DataI; import com.njcn.dataProcess.po.influx.DataPlt; import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; @@ -132,6 +133,7 @@ public class InfluxdbDataPltImpl extends MppServiceImpl getMinuteDataPlt(LineCountEvaluateParam lineParam) { + List dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class); influxQueryWrapper.regular(DataPlt::getLineId, lineParam.getLineId()) @@ -139,39 +141,48 @@ public class InfluxdbDataPltImpl extends MppServiceImpl list = dataPltMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataPlt::getLineId)); - //有异常数据 - if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { - lineMap.forEach((k,v)->{ - List timeList = lineParam.getAbnormalTime().get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if(CollUtil.isNotEmpty(list)){ + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataPlt::getLineId)); + //有异常数据 + if (CollectionUtil.isNotEmpty(lineParam.getAbnormalTime())) { + lineMap.forEach((k,v)->{ + List timeList = lineParam.getAbnormalTime().get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(dataList); + } } return result; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java index 180d47c..3b0f51a 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java @@ -15,7 +15,6 @@ import com.njcn.dataProcess.dto.DataVFiveItemDTO; import com.njcn.dataProcess.dto.LineDataVFiveItemDTO; import com.njcn.dataProcess.dto.MeasurementCountDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.po.influx.DataFlicker; import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataVCvtDto; @@ -25,6 +24,7 @@ import com.njcn.dataProcess.service.IDataV; import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -41,6 +41,7 @@ import java.util.stream.Collectors; * @version 1.0 * @data 2024/11/7 11:02 */ +@Slf4j @Service("InfluxdbDataVImpl") public class InfluxdbDataVImpl extends MppServiceImpl implements IDataV { @@ -128,6 +129,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam - lineParam) { + private void quality(List result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) { + List dataList; List list = dataVMapper.selectByQueryWrapper(influxQueryWrapper); - if (CollUtil.isNotEmpty(list)) { - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataV::getLineId)); + //过滤掉暂态事件影响的数据 true过滤 false不过滤 + if (lineParam.getDataType()) { + dataList = list.stream().filter(item -> Objects.isNull(item.getAbnormalFlag())).collect(Collectors.toList()); + } else { + dataList = list; + } + Map> lineMap = dataList.stream().collect(Collectors.groupingBy(DataV::getLineId)); //有异常数据 Map> timeMap = lineParam.getAbnormalTime(); if (CollectionUtil.isNotEmpty(timeMap)) { @@ -449,7 +457,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); @@ -45,4 +50,9 @@ public class RelationDataHarmRateIImpl extends MppServiceImpl dataIList) { + + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java index 68fbf24..3d2db71 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java @@ -7,6 +7,7 @@ import com.njcn.dataProcess.dto.DataHarmphasicIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.relation.DataHarmphasicI; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import com.njcn.dataProcess.service.IDataHarmphasicI; @@ -67,6 +68,11 @@ public class RelationDataHarmphasicIImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java index 9d259a5..e71de31 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java @@ -69,6 +69,11 @@ public class RelationDataHarmpowerQImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java index cef38b5..1e1f4d7 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java @@ -64,6 +64,11 @@ public class RelationDataHarmpowerSImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java index 8ccc621..02cdfd7 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java @@ -5,16 +5,15 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataIRelationMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataIRelationMapper; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; +import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.po.relation.DataI; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataID; import com.njcn.dataProcess.service.IDataI; @@ -26,8 +25,13 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -40,9 +44,9 @@ import java.util.stream.Collectors; @Service("RelationDataIImpl") @RequiredArgsConstructor public class RelationDataIImpl extends MppServiceImpl implements IDataI { + private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @Resource private DataIRelationMapper dataIRelationMapper; - @Resource private IDataI iDataI; @@ -96,6 +100,10 @@ public class RelationDataIImpl extends MppServiceImpl dataIList) { + } + @Override public List getDataI(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java index e688fb1..a159f97 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java @@ -62,6 +62,11 @@ public class RelationDataInharmIImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + @Override public List getBaseData(LineCountEvaluateParam lineParam) { return Collections.emptyList();