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 721f418..d5d4eae 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,7 +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.dto.RmpEventDetailDTO; import com.njcn.dataProcess.enums.DataCleanEnum; import com.njcn.dataProcess.param.DataCleanParam; import com.njcn.dataProcess.param.LineCountEvaluateParam; @@ -22,7 +22,6 @@ 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; @@ -160,105 +159,70 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改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); + item1.setAbnormalFlag(1); }); - dataFlickerFeignClient.batchInsertion(dataFlickerDTOList); + dataFlickerFeignClient.addInfluxDbList(dataFlicker); 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); + item1.setAbnormalFlag(1); }); - dataFlucFeignClient.batchInsertion(dataFlucDTOList); + dataFlucFeignClient.addInfluxDbList(dataFluc); 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); + List dataHarmI = dataHarmphasicIFeignClient.getRawData(param).getData(); + if (CollUtil.isNotEmpty(dataHarmI)) { + dataHarmI.forEach(item1->{ + item1.setAbnormalFlag(1); }); - dataHarmphasicIFeignClient.batchInsertion(dataHarmphasicIDTOList); - log.info("修改dataHarmPhasicI数据量:{}", dataHarmPhasicI.size()); + dataHarmphasicIFeignClient.addInfluxDbList(dataHarmI); + log.info("修改dataHarmI数据量:{}", dataHarmI.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); + item1.setAbnormalFlag(1); }); - dataHarmphasicVFeignClient.batchInsertion(dataHarmphasicVDTOList); + dataHarmphasicVFeignClient.addInfluxDbList(DataHarmV); 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); + item1.setAbnormalFlag(1); }); - dataHarmpowerPFeignClient.batchInsertion(dataHarmpowerPDTOList); - log.info("修改 dataHarmPowerP数据量:{}", dataPowerP.size()); + dataHarmpowerPFeignClient.addInfluxDbList(dataPowerP); + 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); + item1.setAbnormalFlag(1); }); - dataHarmpowerQFeignClient.batchInsertion(dataHarmpowerQDTOList); + dataHarmpowerQFeignClient.addInfluxDbList(dataHarmPowerQ); 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); + item1.setAbnormalFlag(1); }); - dataHarmpowerSFeignClient.batchInsertion(dataHarmpowerSDTOList); + dataHarmpowerSFeignClient.addInfluxDbList(dataHarmPowerS); log.info("修改dataHarmPowerS数据量:{}", dataHarmPowerS.size()); } @@ -275,55 +239,40 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改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); + item1.setAbnormalFlag(1); }); - dataHarmRateVFeignClient.batchInsertion(dataHarmrateVDTOList); + dataHarmRateVFeignClient.addInfluxDbList(DataHarmRateV); log.info("修改dataHarmRateV数据量:{}", DataHarmRateV.size()); } //修改dataInHarmI数据 - List dataInHarmI = dataHarmRateIFeignClient.getRawData(param).getData(); + List dataInHarmI = dataInharmIFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataInHarmI)) { dataInHarmI.forEach(item1->{ item1.setAbnormalFlag(1); }); - dataHarmRateIFeignClient.addInfluxDbList(dataInHarmI); - log.info("修改dataHarmRateI数据量:{}", dataInHarmI.size()); + dataInharmIFeignClient.addInfluxDbList(dataInHarmI); + log.info("修改dataInHarmI数据量:{}", 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); + item1.setAbnormalFlag(1); }); - dataInharmVFeignClient.batchInsertion(dataInharmVDTOList); + dataInharmVFeignClient.addInfluxDbList(dataInHarmV); 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); + item1.setAbnormalFlag(1); }); - dataPltFeignClient.batchInsertion(dataPltDTOList); + dataPltFeignClient.addInfluxDbList(dataPlt); log.info("修改dataPlt数据量:{}", dataPlt.size()); } }); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java index 788a674..25c7c4b 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlickerFeignClient.java @@ -1,13 +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.DataFlickerFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataFlickerDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlickerDto; 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; @@ -36,4 +42,7 @@ public interface DataFlickerFeignClient { @PostMapping("/getColumnNameCountRawData") HttpResult getColumnNameCountRawData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java index dccbe55..c36049b 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataFlucFeignClient.java @@ -35,4 +35,7 @@ public interface DataFlucFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } 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 8680fe6..05e7e03 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,19 +1,13 @@ 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; @@ -43,4 +37,7 @@ public interface DataHarmRateVFeignClient { @PostMapping("/batchInsertion") HttpResult batchInsertion(@RequestBody List dataHarmrateVDTOList); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } 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 b9a1653..b681c9b 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,20 +1,12 @@ 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; @@ -41,4 +33,7 @@ public interface DataHarmphasicIFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java index ad80014..4325854 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmphasicVFeignClient.java @@ -1,13 +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.DataHarmphasicVFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataHarmphasicVDTO; 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.DataHarmPhasicVDto; +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; @@ -36,4 +42,7 @@ public interface DataHarmphasicVFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java index 88ce4ae..910546e 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmpowerPFeignClient.java @@ -1,7 +1,12 @@ 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.DataHarmpowerPFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataHarmpowerPDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; @@ -9,6 +14,7 @@ import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; +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; @@ -34,4 +40,7 @@ public interface DataHarmpowerPFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List data); + + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); } 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 75d9e63..7a64fdc 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,18 +1,12 @@ 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; @@ -41,4 +35,7 @@ public interface DataHarmpowerQFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } 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 76fab5d..6b9c089 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 @@ -41,4 +41,7 @@ public interface DataHarmpowerSFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } 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 5e0faf6..557341f 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 @@ -33,4 +33,7 @@ public interface DataInharmIFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } 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 05a1de0..2bb7bb0 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 @@ -2,13 +2,11 @@ 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.DataInharmVFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataInharmVDTO; 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.DataInHarmIDto; import com.njcn.dataProcess.pojo.dto.DataInHarmVDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -36,4 +34,7 @@ public interface DataInharmVFeignClient { @PostMapping("/addList") HttpResult addList(@RequestBody List list); + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); + } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java index 7d51b0c..830b832 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataPltFeignClient.java @@ -37,4 +37,7 @@ public interface DataPltFeignClient { @PostMapping("/getDataPlt") HttpResult> getDataPlt(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addInfluxDbList") + HttpResult addInfluxDbList(@RequestBody List list); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java index 583f7c7..5539f5a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlickerFeignClientFallbackFactory.java @@ -71,6 +71,12 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataFlicker原始数据录入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java index 8e6f72d..f4a2e4b 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataFlucFeignClientFallbackFactory.java @@ -65,6 +65,12 @@ public class DataFlucFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataFluc原始数据录入",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 7f1fc99..5175af4 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 @@ -74,6 +74,12 @@ public class DataHarmRateVFeignClientFallbackFactory implements FallbackFactory< throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataHarmRateV原始数据插入",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 2dc8179..c11c7ea 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 @@ -65,6 +65,12 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","时序数据库插入数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicVFeignClientFallbackFactory.java index 7f15a62..447d234 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmphasicVFeignClientFallbackFactory.java @@ -65,6 +65,12 @@ public class DataHarmphasicVFeignClientFallbackFactory implements FallbackFactor throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataHarmPhasicV原始数据录入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java index 313f483..11e5889 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmpowerPFeignClientFallbackFactory.java @@ -65,6 +65,12 @@ public class DataHarmpowerPFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataPowerP原始数据插入",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 847a7b2..e01ddf6 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 @@ -64,6 +64,12 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataHarmPowerQ原始数据插入",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 e37d695..afdcf45 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 @@ -9,7 +9,6 @@ import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerSDto; import com.njcn.dataProcess.util.DataProcessingEnumUtil; -import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -65,6 +64,12 @@ public class DataHarmpowerSFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult addInfluxDbList(List list) { + 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/DataInharmIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmIFeignClientFallbackFactory.java index a8b3cab..09804ad 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 @@ -65,6 +65,12 @@ public class DataInharmIFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataInharmI原始数据插入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java index aa69395..30a5190 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataInharmVFeignClientFallbackFactory.java @@ -65,6 +65,12 @@ public class DataInharmVFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataInharmV原始数据插入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java index 01d0875..4518584 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataPltFeignClientFallbackFactory.java @@ -70,6 +70,12 @@ public class DataPltFeignClientFallbackFactory implements FallbackFactory addInfluxDbList(List list) { + log.error("{}异常，降级处理，异常为：{}","dataPlt原始数据插入",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } 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 a640ecf..6418804 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -22,6 +23,7 @@ import java.time.LocalDateTime; */ @Getter @Setter +@Data public class DataHarmphasicIDTO implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java index 8b0e44d..b1c52f2 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlickerController.java @@ -12,7 +12,6 @@ import com.njcn.dataProcess.dto.DataFlickerDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlickerDto; -import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.service.IDataFlicker; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -93,4 +92,13 @@ public class DataFlickerController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataFlickerQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java index 6c81d59..a4530fc 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataFlucController.java @@ -12,6 +12,7 @@ import com.njcn.dataProcess.dto.DataFlucDTO; 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.DataVDto; import com.njcn.dataProcess.service.IDataFluc; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -82,4 +83,13 @@ public class DataFlucController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataFlucQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java index b6da7f6..de6bdf0 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java @@ -12,6 +12,7 @@ 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.DataHarmRateIDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; import com.njcn.dataProcess.service.IDataHarmRateV; import com.njcn.web.controller.BaseController; @@ -101,4 +102,13 @@ public class DataHarmRateVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmRateVQuery.addInfluxDbList(list); + 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 d814816..b69d11a 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 @@ -13,6 +13,7 @@ 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.dto.DataVDto; import com.njcn.dataProcess.service.IDataHarmphasicI; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -84,7 +85,14 @@ public class DataHarmphasicIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } - + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmphasicIQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java index d858cf9..016a1b7 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmphasicVController.java @@ -12,7 +12,6 @@ import com.njcn.dataProcess.dto.DataHarmphasicVDTO; 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.dto.DataHarmPhasicVDto; import com.njcn.dataProcess.service.IDataHarmphasicV; import com.njcn.web.controller.BaseController; @@ -85,4 +84,13 @@ public class DataHarmphasicVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmphasicVQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java index 6d981b0..f1b1f9c 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmpowerPController.java @@ -11,7 +11,6 @@ import com.njcn.dataProcess.annotation.QueryBean; import com.njcn.dataProcess.dto.DataHarmpowerPDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto; import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; import com.njcn.dataProcess.service.IDataHarmpowerP; @@ -85,4 +84,13 @@ public class DataHarmpowerPController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmpowerPQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } 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 0a78443..10280eb 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 @@ -83,7 +83,14 @@ public class DataHarmpowerQController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } - + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmpowerQQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } } 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 c50b775..26b6033 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 @@ -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.DataHarmpowerSDTO; import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; +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.service.IDataHarmpowerS; import com.njcn.web.controller.BaseController; @@ -83,4 +82,13 @@ public class DataHarmpowerSController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataHarmpowerSQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", 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 2caea46..18a2759 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,7 +11,6 @@ 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; @@ -84,4 +83,13 @@ public class DataInharmIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataInharmIQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java index c2d8427..cf192d1 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataInharmVController.java @@ -13,6 +13,7 @@ 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.DataInHarmVDto; +import com.njcn.dataProcess.pojo.dto.DataVDto; import com.njcn.dataProcess.service.IDataInharmV; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -84,5 +85,13 @@ public class DataInharmVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataInharmVQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } } 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 97455ca..de2f810 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 @@ -92,5 +92,13 @@ public class DataPltController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addInfluxDbList") + @ApiOperation("时序数据库插入数据") + public HttpResult addInfluxDbList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addInfluxDbList"); + dataPltQuery.addInfluxDbList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java index 4ebfae9..555b6ba 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFlicker.java @@ -37,6 +37,8 @@ public interface IDataFlicker extends IMppService { */ void addList(List dataIDtoList); + void addInfluxDbList(List list); + /** * 时间分组获取条目数量 * @param lineParam diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java index 0d0021e..a003580 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataFluc.java @@ -5,6 +5,7 @@ import com.njcn.dataProcess.dto.DataFlucDTO; 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.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataFlucD; import java.util.List; @@ -36,4 +37,6 @@ public interface IDataFluc extends IMppService { * 批量插入数据 */ void addList(List dataFlucDtoList); + + void addInfluxDbList(List list); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java index 71193d6..d6dcfcf 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java @@ -40,4 +40,6 @@ IDataHarmRateV extends IMppService { List getHarmRateVData(LineCountEvaluateParam lineParam); + void addInfluxDbList(List dataVList); + } 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 bd072bf..e2cda57 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 @@ -6,6 +6,7 @@ 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.dto.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import java.util.List; @@ -38,4 +39,6 @@ public interface IDataHarmphasicI extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List list); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java index 6409197..989ae14 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmphasicV.java @@ -37,4 +37,6 @@ public interface IDataHarmphasicV extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List list); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java index 60b2489..0076ec3 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmpowerP.java @@ -37,4 +37,6 @@ public interface IDataHarmpowerP extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List list); } 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 88be2a4..4a4f386 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 @@ -37,4 +37,6 @@ public interface IDataHarmpowerQ extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List list); } 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 6b4a979..53a36d0 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,7 +4,6 @@ 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; @@ -38,4 +37,6 @@ public interface IDataHarmpowerS extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List list); } 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 d806188..c9ce79c 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,7 +4,6 @@ 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; @@ -38,4 +37,6 @@ public interface IDataInharmI extends IMppService { * 批量插入数据 */ void addList(List list); + + void addInfluxDbList(List dataVList); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java index bbd11af..1347268 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataInharmV.java @@ -6,6 +6,7 @@ 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.DataInHarmVDto; +import com.njcn.dataProcess.pojo.dto.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataInHarmVD; import java.util.List; @@ -39,4 +40,6 @@ public interface IDataInharmV extends IMppService { */ void addList(List list); + void addInfluxDbList(List list); + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java index 08f95b6..fae1cdf 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataPlt.java @@ -5,6 +5,7 @@ import com.njcn.dataProcess.dto.DataPltDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataPltDto; +import com.njcn.dataProcess.pojo.dto.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataPltD; import java.util.List; @@ -38,4 +39,6 @@ public interface IDataPlt extends IMppService { void addList(List list); List getDataPlt(LineCountEvaluateParam lineParam); + + void addInfluxDbList(List list); } 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 73244f9..e39b631 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,8 +9,6 @@ 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; import com.njcn.dataProcess.pojo.po.RStatDataFlickerD; @@ -22,6 +20,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.*; @@ -123,6 +122,18 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataFlicker data = new DataFlicker(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataFlickerMapper.insertBatch(result); + } + @Override public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java index 767b379..d76ce29 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java @@ -18,6 +18,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.*; @@ -118,6 +119,18 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataFluc data = new DataFluc(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataFlucMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 094f4f8..45c17c9 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,7 +9,6 @@ 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; @@ -195,6 +194,18 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmrateV dataV = new DataHarmrateV(); + BeanUtils.copyProperties(item, dataV); + dataV.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataV); + }); + dataHarmRateVMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 3134a9f..502e605 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 @@ -9,9 +9,7 @@ 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; @@ -23,6 +21,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.*; @@ -55,7 +54,6 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl> partition = ListUtils.partition(collect, minSize); for (List dataHarmphasicIList : partition) { List sublistAsOriginalListType = new ArrayList<>(dataHarmphasicIList); - dataHarmphasicIMapper.insertBatch(sublistAsOriginalListType); } @@ -175,6 +173,18 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmphasicI data = new DataHarmphasicI(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataHarmphasicIMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 d83f633..4b856a4 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 @@ -8,9 +8,7 @@ import com.njcn.dataProcess.dao.imapper.DataHarmphasicVMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicVRelationMapper; 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; @@ -24,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.*; @@ -178,6 +177,18 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmphasicV data = new DataHarmphasicV(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataHarmphasicVMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 27dfc0c..dbeb7b9 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 @@ -8,9 +8,7 @@ import com.njcn.dataProcess.dao.imapper.DataHarmpowerPMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerPRelationMapper; 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; @@ -24,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.*; @@ -181,6 +180,18 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmpowerP data = new DataHarmpowerP(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataHarmpowerPMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 2565401..13b54f4 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 @@ -8,9 +8,7 @@ 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.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; @@ -23,6 +21,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.*; @@ -177,6 +176,18 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmpowerQ data = new DataHarmpowerQ(); + BeanUtils.copyProperties(item, data); + data.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(data); + }); + dataHarmpowerQMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 9f9c88b..8664432 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 @@ -8,10 +8,8 @@ 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; @@ -23,6 +21,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.*; @@ -177,6 +176,18 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmpowerS dataV = new DataHarmpowerS(); + BeanUtils.copyProperties(item, dataV); + dataV.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataV); + }); + dataHarmpowerSMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 a4d8823..c9572d5 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 @@ -9,7 +9,6 @@ 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; @@ -22,6 +21,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.*; @@ -174,6 +174,18 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl dataVList) { + List result = new ArrayList<>(); + dataVList.forEach(item -> { + DataInharmI dataV = new DataInharmI(); + BeanUtils.copyProperties(item, dataV); + dataV.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataV); + }); + dataInharmIMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 4ecad13..c53e8c4 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 @@ -8,9 +8,7 @@ import com.njcn.dataProcess.dao.imapper.DataInharmVMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataInHarmVRelationMapper; 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; @@ -24,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.*; @@ -178,6 +177,18 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataInharmV dataV = new DataInharmV(); + BeanUtils.copyProperties(item, dataV); + dataV.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataV); + }); + dataInharmVMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取dataI分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 e7df303..42caac9 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,7 +7,6 @@ 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; @@ -21,6 +20,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.*; @@ -124,6 +124,18 @@ public class InfluxdbDataPltImpl extends MppServiceImpl list) { + List result = new ArrayList<>(); + list.forEach(item -> { + DataPlt dataV = new DataPlt(); + BeanUtils.copyProperties(item, dataV); + dataV.setTime(LocalDateTime.parse(item.getMinTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant()); + result.add(dataV); + }); + dataPltMapper.insertBatch(result); + } + /** * 按监测点集合、时间条件获取dataI分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java index 4a05740..fb75eda 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java @@ -90,6 +90,11 @@ public class RelationDataFlickerImpl extends MppServiceImpl list) { + + } + @Override public Integer getColumnNameCountRawData(LineCountEvaluateParam lineParam) { return 0; diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java index 78c21e5..ede3f4a 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java @@ -81,5 +81,10 @@ public class RelationDataFlucImpl extends MppServiceImpl list) { + + } + ; } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java index 2eee264..d9dd7a0 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java @@ -123,6 +123,11 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl dataVList) { + + } + private List quality(List list, LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmDto::getLineId)); 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 3d2db71..6b8baf6 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 @@ -91,4 +91,9 @@ public class RelationDataHarmphasicIImpl extends MppServiceImpl list) { + + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java index 4f7fca7..55fffdd 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java @@ -89,5 +89,10 @@ public class RelationDataHarmphasicVImpl extends MppServiceImpl list) { + + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java index 1d0672f..0892bb1 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java @@ -89,4 +89,9 @@ public class RelationDataHarmpowerPImpl extends MppServiceImpl list) { + + } } 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 e71de31..8d7917b 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 @@ -92,4 +92,9 @@ public class RelationDataHarmpowerQImpl extends MppServiceImpl list) { + + } } 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 1e1f4d7..03c88b8 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 @@ -87,4 +87,9 @@ public class RelationDataHarmpowerSImpl extends MppServiceImpl list) { + + } } 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 a159f97..72cec81 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 @@ -85,4 +85,9 @@ public class RelationDataInharmIImpl extends MppServiceImpl dataVList) { + + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java index 48ea304..97dd77c 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java @@ -88,4 +88,9 @@ public class RelationDataInharmVImpl extends MppServiceImpl list) { + + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java index 1db4c71..c26f509 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java @@ -118,6 +118,11 @@ public class RelationDataPltImpl extends MppServiceImpl list) { + + } + private List quality(List list, LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataPltDto::getLineId));