From 2632c4f7ffe468fa48d7ea921794d9e68f57c594 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 28 Feb 2025 16:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=97=A5=E8=A1=A8=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/MeasurementExecutor.java | 64 +- .../service/line/IDayDataService.java | 56 ++ .../serviceimpl/line/DayDataServiceImpl.java | 702 +++++++++++++++++- .../api/DataFlickerFeignClient.java | 10 +- .../dataProcess/api/DataFlucFeignClient.java | 8 + .../api/DataHarmphasicIFeignClient.java | 12 +- .../api/DataHarmphasicVFeignClient.java | 8 + .../api/DataHarmpowerPFeignClient.java | 9 + .../api/DataHarmpowerQFeignClient.java | 10 +- .../dataProcess/api/DataIFeignClient.java | 6 + ...DataFlickerFeignClientFallbackFactory.java | 13 + .../DataFlucFeignClientFallbackFactory.java | 13 + ...HarmphasicIFeignClientFallbackFactory.java | 15 + ...HarmphasicVFeignClientFallbackFactory.java | 14 + ...aHarmpowerPFeignClientFallbackFactory.java | 14 + ...aHarmpowerQFeignClientFallbackFactory.java | 15 + .../DataIFeignClientFallbackFactory.java | 14 +- .../pojo/dto/DataHarmPhasicIDto.java | 145 ++++ .../pojo/dto/DataHarmPhasicVDto.java | 146 ++++ .../pojo/dto/DataHarmPowerPDto.java | 153 ++++ .../pojo/dto/DataHarmPowerQDto.java | 147 ++++ .../pojo/dto/DataHarmPowerSDto.java | 147 ++++ .../pojo/dto/DataHarmRateIDto.java | 145 ++++ .../pojo/dto/DataHarmRateVDto.java | 145 ++++ .../dataProcess/pojo/dto/DataInHarmIDto.java | 145 ++++ .../dataProcess/pojo/dto/DataInHarmVDto.java | 145 ++++ .../pojo/po/RStatDataFlickerD.java | 50 ++ .../dataProcess/pojo/po/RStatDataFlucD.java | 47 ++ .../pojo/po/RStatDataHarmPhasicID.java | 191 +++++ .../pojo/po/RStatDataHarmPhasicVD.java | 191 +++++ .../pojo/po/RStatDataHarmPowerPD.java | 200 +++++ .../pojo/po/RStatDataHarmPowerQD.java | 194 +++++ .../pojo/po/RStatDataHarmPowerSD.java | 191 +++++ .../pojo/po/RStatDataHarmRateID.java | 191 +++++ .../pojo/po/RStatDataHarmRateVD.java | 191 +++++ .../njcn/dataProcess/pojo/po/RStatDataID.java | 209 ++++++ .../pojo/po/RStatDataInHarmID.java | 191 +++++ .../pojo/po/RStatDataInHarmVD.java | 191 +++++ .../dataProcess/pojo/po/RStatDataPltD.java | 44 ++ .../controller/DataFlickerController.java | 19 +- .../controller/DataFlucController.java | 20 +- .../controller/DataHarmphasicIController.java | 21 +- .../controller/DataHarmphasicVController.java | 20 +- .../controller/DataHarmpowerPController.java | 21 + .../controller/DataHarmpowerQController.java | 20 + .../controller/DataIController.java | 19 + .../RStatDataFlickerRelationMapper.java | 16 + .../mapper/RStatDataFlucRelationMapper.java | 16 + .../RStatDataHarmPhasicIRelationMapper.java | 16 + .../RStatDataHarmPhasicVRelationMapper.java | 16 + .../RStatDataHarmPowerPRelationMapper.java | 16 + .../RStatDataHarmPowerQRelationMapper.java | 16 + .../RStatDataHarmPowerSRelationMapper.java | 16 + .../RStatDataHarmRateIRelationMapper.java | 16 + .../RStatDataHarmRateVRelationMapper.java | 16 + .../mapper/RStatDataIRelationMapper.java | 16 + .../RStatDataInHarmIRelationMapper.java | 16 + .../RStatDataInHarmVRelationMapper.java | 16 + .../mapper/RStatDataPltRelationMapper.java | 16 + .../dataProcess/service/IDataFlicker.java | 16 +- .../njcn/dataProcess/service/IDataFluc.java | 16 +- .../dataProcess/service/IDataHarmphasicI.java | 18 +- .../dataProcess/service/IDataHarmphasicV.java | 17 +- .../dataProcess/service/IDataHarmpowerP.java | 18 +- .../dataProcess/service/IDataHarmpowerQ.java | 18 +- .../com/njcn/dataProcess/service/IDataI.java | 19 +- .../influxdb/InfluxdbDataFlickerImpl.java | 56 +- .../impl/influxdb/InfluxdbDataFlucImpl.java | 55 +- .../influxdb/InfluxdbDataHarmphasicIImpl.java | 173 ++++- .../influxdb/InfluxdbDataHarmphasicVImpl.java | 114 ++- .../influxdb/InfluxdbDataHarmpowerPImpl.java | 125 +++- .../influxdb/InfluxdbDataHarmpowerQImpl.java | 178 ++++- .../impl/influxdb/InfluxdbDataIImpl.java | 117 ++- .../relation/RelationDataFlickerImpl.java | 34 +- .../impl/relation/RelationDataFlucImpl.java | 34 +- .../relation/RelationDataHarmphasicIImpl.java | 37 +- .../relation/RelationDataHarmphasicVImpl.java | 35 +- .../relation/RelationDataHarmpowerPImpl.java | 34 +- .../relation/RelationDataHarmpowerQImpl.java | 37 +- .../impl/relation/RelationDataIImpl.java | 35 +- .../impl/relation/RelationDataVImpl.java | 1 - 81 files changed, 5847 insertions(+), 70 deletions(-) create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicIDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicVDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerPDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerQDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerSDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateIDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmIDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmVDto.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlickerD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlucD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicID.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicVD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerPD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerQD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerSD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateID.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateVD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataID.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmID.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmVD.java create mode 100644 data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataPltD.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlickerRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlucRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicIRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicVRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerPRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerQRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerSRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateIRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateVRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataIRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmIRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmVRelationMapper.java create mode 100644 data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataPltRelationMapper.java 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 0407a65..88e18c2 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 @@ -155,7 +155,6 @@ public class MeasurementExecutor extends BaseExecutor { } - /** * 监测点报表_日表(r_stat_data_*_d) * @author xy @@ -169,4 +168,67 @@ public class MeasurementExecutor extends BaseExecutor { dayDataService.dataVHandler(bindCmp.getRequestData()); } + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataI", nodeType = NodeTypeEnum.COMMON) + public boolean dataIToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataI", nodeType = NodeTypeEnum.COMMON) + public void dataIToDayProcess(NodeComponent bindCmp) { + dayDataService.dataIHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataFlicker", nodeType = NodeTypeEnum.COMMON) + public boolean dataFlickerToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataFlicker", nodeType = NodeTypeEnum.COMMON) + public void dataFlickerToDayProcess(NodeComponent bindCmp) { + dayDataService.dataFlickerHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataFluc", nodeType = NodeTypeEnum.COMMON) + public boolean dataFlucToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataFluc", nodeType = NodeTypeEnum.COMMON) + public void dataFlucToDayProcess(NodeComponent bindCmp) { + dayDataService.dataFlucHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataHarmPhasicI", nodeType = NodeTypeEnum.COMMON) + public boolean dataHarmPhasicIToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataHarmPhasicI", nodeType = NodeTypeEnum.COMMON) + public void dataHarmPhasicIToDayProcess(NodeComponent bindCmp) { + dayDataService.dataHarmPhasicIHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataHarmPhasicV", nodeType = NodeTypeEnum.COMMON) + public boolean dataHarmPhasicVToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataHarmPhasicV", nodeType = NodeTypeEnum.COMMON) + public void dataHarmPhasicVToDayProcess(NodeComponent bindCmp) { + dayDataService.dataHarmPhasicVHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataHarmPowerP", nodeType = NodeTypeEnum.COMMON) + public boolean dataHarmPowerPToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataHarmPowerP", nodeType = NodeTypeEnum.COMMON) + public void dataHarmPowerPToDayProcess(NodeComponent bindCmp) { + dayDataService.dataHarmPowerPHandler(bindCmp.getRequestData()); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataHarmPowerQ", nodeType = NodeTypeEnum.COMMON) + public boolean dataHarmPowerQToDayAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataHarmPowerQ", nodeType = NodeTypeEnum.COMMON) + public void dataHarmPowerQToDayProcess(NodeComponent bindCmp) { + dayDataService.dataHarmPowerQHandler(bindCmp.getRequestData()); + } + } diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDayDataService.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDayDataService.java index 9484c73..1068e48 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDayDataService.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDayDataService.java @@ -16,4 +16,60 @@ public interface IDayDataService { */ void dataVHandler(CalculatedParam calculatedParam); + /*** + * dataI转r_stat_data_i_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataIHandler(CalculatedParam calculatedParam); + + /*** + * dataFlicker转r_stat_data_flicker_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataFlickerHandler(CalculatedParam calculatedParam); + + /*** + * dataFluc转r_stat_data_fluc_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataFlucHandler(CalculatedParam calculatedParam); + + /*** + * dataHarmPhasicI转r_stat_data_harmphasic_i_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataHarmPhasicIHandler(CalculatedParam calculatedParam); + + /*** + * dataHarmPhasicV转r_stat_data_harmphasic_v_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataHarmPhasicVHandler(CalculatedParam calculatedParam); + + /*** + * dataHarmPowerP转r_stat_data_harmpower_p_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataHarmPowerPHandler(CalculatedParam calculatedParam); + + /*** + * dataHarmPowerQ转r_stat_data_harmpower_q_d + * @author xuyang + * @date 2025/01/18 21:18 + * @param calculatedParam 查询条件 + */ + void dataHarmPowerQHandler(CalculatedParam calculatedParam); + } diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java index 77a8ef7..a3844a0 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java @@ -3,15 +3,14 @@ package com.njcn.algorithm.serviceimpl.line; import cn.hutool.core.collection.CollUtil; import com.njcn.algorithm.pojo.bo.CalculatedParam; import com.njcn.algorithm.service.line.IDayDataService; -import com.njcn.dataProcess.api.DataVFeignClient; -import com.njcn.dataProcess.api.PqDataVerifyFeignClient; +import com.njcn.dataProcess.api.*; import com.njcn.dataProcess.enums.DataCleanEnum; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataVDto; +import com.njcn.dataProcess.pojo.dto.*; import com.njcn.dataProcess.pojo.po.PqDataVerify; import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; +import com.njcn.influx.pojo.po.DataHarmPowerQ; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; @@ -36,6 +35,22 @@ public class DayDataServiceImpl implements IDayDataService { private final static Integer NUM = 100; @Resource private DataVFeignClient dataVFeignClient; + @Resource + private DataIFeignClient dataIFeignClient; + @Resource + private DataFlickerFeignClient dataFlickerFeignClient; + @Resource + private DataFlucFeignClient dataFlucFeignClient; + @Resource + private DataHarmphasicIFeignClient dataHarmphasicIFeignClient; + @Resource + private DataHarmphasicVFeignClient dataHarmphasicVFeignClient; + @Resource + private DataHarmpowerPFeignClient dataHarmpowerPFeignClient; + @Resource + private DataHarmpowerQFeignClient dataHarmpowerQFeignClient; + + @Resource private PqDataVerifyFeignClient pqDataVerifyFeignClient; @@ -70,7 +85,7 @@ public class DayDataServiceImpl implements IDayDataService { dto.setLineId(item.getLineId()); dto.setPhasicType(item2.getPhasicType()); dto.setValueType(item3.getValueType()); - dto.setQualityFlag(item.getQualityFlag()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); channelDataVHandler(item3,valueTypes,dto,true); result.add(dto); }); @@ -84,6 +99,324 @@ public class DayDataServiceImpl implements IDayDataService { } } + @Override + public void dataIHandler(CalculatedParam calculatedParam) { + logger.info("{},dataI表转r_stat_data_i_d算法开始=====》", LocalDateTime.now()); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataIFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + //获取平均值集合 + CommonMinuteDto.ValueType valueTypes = valueTypeList.stream().filter(type-> type.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.AVG_WEB)).findFirst().orElse(null); + valueTypeList.forEach(item3->{ + DataIDto dto = new DataIDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item3.getValueType()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataIHandler(item3,valueTypes,dto,true); + result.add(dto); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataIFeignClient.addList(result); + } + } + + @Override + public void dataFlickerHandler(CalculatedParam calculatedParam) { + logger.info("{},dataFlicker表转r_stat_data_flicker_d算法开始=====》", LocalDateTime.now()); + List valueList = Arrays.asList("AVG","MAX","MIN","CP95"); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataFlickerFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + valueTypeList.forEach(item3->{ + valueList.forEach(item4->{ + DataFlickerDto dto = new DataFlickerDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item4); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataFlickerHandler(item3,dto,item4,true); + result.add(dto); + }); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataFlickerFeignClient.addList(result); + } + } + + @Override + public void dataFlucHandler(CalculatedParam calculatedParam) { + logger.info("{},dataFluc表转r_stat_data_fluc_d算法开始=====》", LocalDateTime.now()); + List valueList = Arrays.asList("AVG","MAX","MIN","CP95"); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataFlucFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + valueTypeList.forEach(item3->{ + valueList.forEach(item4->{ + DataFlucDto dto = new DataFlucDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item4); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataFlucHandler(item3,dto,item4,true); + result.add(dto); + }); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataFlucFeignClient.addList(result); + } + } + + @Override + public void dataHarmPhasicIHandler(CalculatedParam calculatedParam) { + logger.info("{},dataHarmPhasicI表转r_stat_data_harmphasic_i_d算法开始=====》", LocalDateTime.now()); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataHarmphasicIFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + //获取平均值集合 + CommonMinuteDto.ValueType valueTypes = valueTypeList.stream().filter(type-> type.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.AVG_WEB)).findFirst().orElse(null); + valueTypeList.forEach(item3->{ + DataHarmPhasicIDto dto = new DataHarmPhasicIDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item3.getValueType()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataHarmPhasicIHandler(item3,valueTypes,dto,true); + result.add(dto); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataHarmphasicIFeignClient.addList(result); + } + } + + @Override + public void dataHarmPhasicVHandler(CalculatedParam calculatedParam) { + logger.info("{},dataHarmPhasicV表转r_stat_data_harmphasic_v_d算法开始=====》", LocalDateTime.now()); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataHarmphasicVFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + //获取平均值集合 + CommonMinuteDto.ValueType valueTypes = valueTypeList.stream().filter(type-> type.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.AVG_WEB)).findFirst().orElse(null); + valueTypeList.forEach(item3->{ + DataHarmPhasicVDto dto = new DataHarmPhasicVDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item3.getValueType()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataHarmPhasicVHandler(item3,valueTypes,dto,true); + result.add(dto); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataHarmphasicVFeignClient.addList(result); + } + } + + @Override + public void dataHarmPowerPHandler(CalculatedParam calculatedParam) { + logger.info("{},dataHarmPowerP表转r_stat_data_harmpower_p_d算法开始=====》", LocalDateTime.now()); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataHarmpowerPFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + //获取平均值集合 + CommonMinuteDto.ValueType valueTypes = valueTypeList.stream().filter(type-> type.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.AVG_WEB)).findFirst().orElse(null); + valueTypeList.forEach(item3->{ + DataHarmPowerPDto dto = new DataHarmPowerPDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item3.getValueType()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataHarmPowerPHandler(item3,valueTypes,dto,true); + result.add(dto); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataHarmpowerPFeignClient.addList(result); + } + } + + @Override + public void dataHarmPowerQHandler(CalculatedParam calculatedParam) { + logger.info("{},dataHarmPowerQ表转r_stat_data_harmpower_q_d算法开始=====》", LocalDateTime.now()); + List result = new ArrayList<>(); + //远程接口获取分钟数据 + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + //以100个监测点分片处理 + List> pendingIds = ListUtils.partition(calculatedParam.getIdList(),NUM); + pendingIds.forEach(list->{ + lineParam.setLineId(list); + //添加异常数据时间点 + getAbnormalData(lineParam); + //获取原始数据 + List partList = dataHarmpowerQFeignClient.getBaseData(lineParam).getData(); + if (CollUtil.isNotEmpty(partList)) { + partList.forEach(item->{ + //相别 + List phasicTypeList = item.getPhasicTypeList(); + phasicTypeList.forEach(item2->{ + //数据类型 + List valueTypeList = item2.getValueTypeList(); + //获取平均值集合 + CommonMinuteDto.ValueType valueTypes = valueTypeList.stream().filter(type-> type.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.AVG_WEB)).findFirst().orElse(null); + valueTypeList.forEach(item3->{ + DataHarmPowerQDto dto = new DataHarmPowerQDto(); + dto.setTime(item.getTime()); + dto.setLineId(item.getLineId()); + dto.setPhasicType(item2.getPhasicType()); + dto.setValueType(item3.getValueType()); + dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag()); + channelDataHarmPowerQHandler(item3,valueTypes,dto,true); + result.add(dto); + }); + }); + }); + } + }); + if (CollUtil.isNotEmpty(result)) { + //存储数据 + dataHarmpowerQFeignClient.addList(result); + } + + } + //获取异常数据集合 public void getAbnormalData(LineCountEvaluateParam lineParam) { lineParam.setTableName(DataCleanEnum.DataV.getCode()); @@ -181,6 +514,365 @@ public class DayDataServiceImpl implements IDayDataService { dto.setV50(getData(type,valueType.getValueList().get(60),scheme)); } + public void channelDataIHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataIDto dto, boolean scheme) { + CommonMinuteDto.ValueType valueType; + String type; + if (dto.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.CP95) && !scheme) { + valueType = pojo2; + type = "CP95"; + } else { + valueType = pojo1; + type = pojo1.getValueType(); + } + //按照指标集合排列顺序取值 + dto.setINeg(getData(type,valueType.getValueList().get(0),scheme)); + dto.setIPos(getData(type,valueType.getValueList().get(1),scheme)); + dto.setIThd(getData(type,valueType.getValueList().get(2),scheme)); + dto.setIUnbalance(getData(type,valueType.getValueList().get(3),scheme)); + dto.setIZero(getData(type,valueType.getValueList().get(4),scheme)); + dto.setRms(getData(type,valueType.getValueList().get(5),scheme)); + + dto.setI1(getData(type,valueType.getValueList().get(6),scheme)); + dto.setI2(getData(type,valueType.getValueList().get(7),scheme)); + dto.setI3(getData(type,valueType.getValueList().get(8),scheme)); + dto.setI4(getData(type,valueType.getValueList().get(9),scheme)); + dto.setI5(getData(type,valueType.getValueList().get(10),scheme)); + dto.setI6(getData(type,valueType.getValueList().get(11),scheme)); + dto.setI7(getData(type,valueType.getValueList().get(12),scheme)); + dto.setI8(getData(type,valueType.getValueList().get(13),scheme)); + dto.setI9(getData(type,valueType.getValueList().get(14),scheme)); + dto.setI10(getData(type,valueType.getValueList().get(15),scheme)); + + dto.setI11(getData(type,valueType.getValueList().get(16),scheme)); + dto.setI12(getData(type,valueType.getValueList().get(17),scheme)); + dto.setI13(getData(type,valueType.getValueList().get(18),scheme)); + dto.setI14(getData(type,valueType.getValueList().get(19),scheme)); + dto.setI15(getData(type,valueType.getValueList().get(20),scheme)); + dto.setI16(getData(type,valueType.getValueList().get(21),scheme)); + dto.setI17(getData(type,valueType.getValueList().get(22),scheme)); + dto.setI18(getData(type,valueType.getValueList().get(23),scheme)); + dto.setI19(getData(type,valueType.getValueList().get(24),scheme)); + dto.setI20(getData(type,valueType.getValueList().get(25),scheme)); + + dto.setI21(getData(type,valueType.getValueList().get(26),scheme)); + dto.setI22(getData(type,valueType.getValueList().get(27),scheme)); + dto.setI23(getData(type,valueType.getValueList().get(28),scheme)); + dto.setI24(getData(type,valueType.getValueList().get(29),scheme)); + dto.setI25(getData(type,valueType.getValueList().get(30),scheme)); + dto.setI26(getData(type,valueType.getValueList().get(31),scheme)); + dto.setI27(getData(type,valueType.getValueList().get(32),scheme)); + dto.setI28(getData(type,valueType.getValueList().get(33),scheme)); + dto.setI29(getData(type,valueType.getValueList().get(34),scheme)); + dto.setI30(getData(type,valueType.getValueList().get(35),scheme)); + + dto.setI31(getData(type,valueType.getValueList().get(36),scheme)); + dto.setI32(getData(type,valueType.getValueList().get(37),scheme)); + dto.setI33(getData(type,valueType.getValueList().get(38),scheme)); + dto.setI34(getData(type,valueType.getValueList().get(39),scheme)); + dto.setI35(getData(type,valueType.getValueList().get(40),scheme)); + dto.setI36(getData(type,valueType.getValueList().get(41),scheme)); + dto.setI37(getData(type,valueType.getValueList().get(42),scheme)); + dto.setI38(getData(type,valueType.getValueList().get(43),scheme)); + dto.setI39(getData(type,valueType.getValueList().get(44),scheme)); + dto.setI40(getData(type,valueType.getValueList().get(45),scheme)); + + dto.setI41(getData(type,valueType.getValueList().get(46),scheme)); + dto.setI42(getData(type,valueType.getValueList().get(47),scheme)); + dto.setI43(getData(type,valueType.getValueList().get(48),scheme)); + dto.setI44(getData(type,valueType.getValueList().get(49),scheme)); + dto.setI45(getData(type,valueType.getValueList().get(50),scheme)); + dto.setI46(getData(type,valueType.getValueList().get(51),scheme)); + dto.setI47(getData(type,valueType.getValueList().get(52),scheme)); + dto.setI48(getData(type,valueType.getValueList().get(53),scheme)); + dto.setI49(getData(type,valueType.getValueList().get(54),scheme)); + dto.setI50(getData(type,valueType.getValueList().get(55),scheme)); + } + + public void channelDataFlickerHandler(CommonMinuteDto.ValueType pojo1, DataFlickerDto dto, String valueType, boolean scheme) { + dto.setFluc(getData(valueType,pojo1.getValueList().get(0),scheme)); + dto.setPlt(getData(valueType,pojo1.getValueList().get(1),scheme)); + dto.setPst(getData(valueType,pojo1.getValueList().get(2),scheme)); + } + + public void channelDataFlucHandler(CommonMinuteDto.ValueType pojo1, DataFlucDto dto, String valueType, boolean scheme) { + dto.setFluc(getData(valueType,pojo1.getValueList().get(0),scheme)); + dto.setFluccf(getData(valueType,pojo1.getValueList().get(1),scheme)); + } + + public void channelDataHarmPhasicIHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataHarmPhasicIDto dto, boolean scheme) { + CommonMinuteDto.ValueType valueType; + String type; + if (dto.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.CP95) && !scheme) { + valueType = pojo2; + type = "CP95"; + } else { + valueType = pojo1; + type = pojo1.getValueType(); + } + //按照指标集合排列顺序取值 + dto.setI1(getData(type,valueType.getValueList().get(0),scheme)); + dto.setI2(getData(type,valueType.getValueList().get(1),scheme)); + dto.setI3(getData(type,valueType.getValueList().get(2),scheme)); + dto.setI4(getData(type,valueType.getValueList().get(3),scheme)); + dto.setI5(getData(type,valueType.getValueList().get(4),scheme)); + dto.setI6(getData(type,valueType.getValueList().get(5),scheme)); + dto.setI7(getData(type,valueType.getValueList().get(6),scheme)); + dto.setI8(getData(type,valueType.getValueList().get(7),scheme)); + dto.setI9(getData(type,valueType.getValueList().get(8),scheme)); + dto.setI10(getData(type,valueType.getValueList().get(9),scheme)); + dto.setI11(getData(type,valueType.getValueList().get(10),scheme)); + + dto.setI12(getData(type,valueType.getValueList().get(11),scheme)); + dto.setI13(getData(type,valueType.getValueList().get(12),scheme)); + dto.setI14(getData(type,valueType.getValueList().get(13),scheme)); + dto.setI15(getData(type,valueType.getValueList().get(14),scheme)); + dto.setI16(getData(type,valueType.getValueList().get(15),scheme)); + dto.setI17(getData(type,valueType.getValueList().get(16),scheme)); + dto.setI18(getData(type,valueType.getValueList().get(17),scheme)); + dto.setI19(getData(type,valueType.getValueList().get(18),scheme)); + dto.setI20(getData(type,valueType.getValueList().get(19),scheme)); + dto.setI21(getData(type,valueType.getValueList().get(20),scheme)); + + dto.setI22(getData(type,valueType.getValueList().get(21),scheme)); + dto.setI23(getData(type,valueType.getValueList().get(22),scheme)); + dto.setI24(getData(type,valueType.getValueList().get(23),scheme)); + dto.setI25(getData(type,valueType.getValueList().get(24),scheme)); + dto.setI26(getData(type,valueType.getValueList().get(25),scheme)); + dto.setI27(getData(type,valueType.getValueList().get(26),scheme)); + dto.setI28(getData(type,valueType.getValueList().get(27),scheme)); + dto.setI29(getData(type,valueType.getValueList().get(28),scheme)); + dto.setI30(getData(type,valueType.getValueList().get(29),scheme)); + + dto.setI31(getData(type,valueType.getValueList().get(30),scheme)); + dto.setI32(getData(type,valueType.getValueList().get(31),scheme)); + dto.setI33(getData(type,valueType.getValueList().get(32),scheme)); + dto.setI34(getData(type,valueType.getValueList().get(33),scheme)); + dto.setI35(getData(type,valueType.getValueList().get(34),scheme)); + dto.setI36(getData(type,valueType.getValueList().get(35),scheme)); + dto.setI37(getData(type,valueType.getValueList().get(36),scheme)); + dto.setI38(getData(type,valueType.getValueList().get(37),scheme)); + dto.setI39(getData(type,valueType.getValueList().get(38),scheme)); + dto.setI40(getData(type,valueType.getValueList().get(39),scheme)); + + dto.setI41(getData(type,valueType.getValueList().get(40),scheme)); + dto.setI42(getData(type,valueType.getValueList().get(41),scheme)); + dto.setI43(getData(type,valueType.getValueList().get(42),scheme)); + dto.setI44(getData(type,valueType.getValueList().get(43),scheme)); + dto.setI45(getData(type,valueType.getValueList().get(44),scheme)); + dto.setI46(getData(type,valueType.getValueList().get(45),scheme)); + dto.setI47(getData(type,valueType.getValueList().get(46),scheme)); + dto.setI48(getData(type,valueType.getValueList().get(47),scheme)); + dto.setI49(getData(type,valueType.getValueList().get(48),scheme)); + dto.setI50(getData(type,valueType.getValueList().get(49),scheme)); + } + + public void channelDataHarmPhasicVHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataHarmPhasicVDto dto, boolean scheme) { + CommonMinuteDto.ValueType valueType; + String type; + if (dto.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.CP95) && !scheme) { + valueType = pojo2; + type = "CP95"; + } else { + valueType = pojo1; + type = pojo1.getValueType(); + } + //按照指标集合排列顺序取值 + dto.setV1(getData(type,valueType.getValueList().get(0),scheme)); + dto.setV2(getData(type,valueType.getValueList().get(1),scheme)); + dto.setV3(getData(type,valueType.getValueList().get(2),scheme)); + dto.setV4(getData(type,valueType.getValueList().get(3),scheme)); + dto.setV5(getData(type,valueType.getValueList().get(4),scheme)); + dto.setV6(getData(type,valueType.getValueList().get(5),scheme)); + dto.setV7(getData(type,valueType.getValueList().get(6),scheme)); + dto.setV8(getData(type,valueType.getValueList().get(7),scheme)); + dto.setV9(getData(type,valueType.getValueList().get(8),scheme)); + dto.setV10(getData(type,valueType.getValueList().get(9),scheme)); + dto.setV11(getData(type,valueType.getValueList().get(10),scheme)); + + dto.setV12(getData(type,valueType.getValueList().get(11),scheme)); + dto.setV13(getData(type,valueType.getValueList().get(12),scheme)); + dto.setV14(getData(type,valueType.getValueList().get(13),scheme)); + dto.setV15(getData(type,valueType.getValueList().get(14),scheme)); + dto.setV16(getData(type,valueType.getValueList().get(15),scheme)); + dto.setV17(getData(type,valueType.getValueList().get(16),scheme)); + dto.setV18(getData(type,valueType.getValueList().get(17),scheme)); + dto.setV19(getData(type,valueType.getValueList().get(18),scheme)); + dto.setV20(getData(type,valueType.getValueList().get(19),scheme)); + dto.setV21(getData(type,valueType.getValueList().get(20),scheme)); + + dto.setV22(getData(type,valueType.getValueList().get(21),scheme)); + dto.setV23(getData(type,valueType.getValueList().get(22),scheme)); + dto.setV24(getData(type,valueType.getValueList().get(23),scheme)); + dto.setV25(getData(type,valueType.getValueList().get(24),scheme)); + dto.setV26(getData(type,valueType.getValueList().get(25),scheme)); + dto.setV27(getData(type,valueType.getValueList().get(26),scheme)); + dto.setV28(getData(type,valueType.getValueList().get(27),scheme)); + dto.setV29(getData(type,valueType.getValueList().get(28),scheme)); + dto.setV30(getData(type,valueType.getValueList().get(29),scheme)); + + dto.setV31(getData(type,valueType.getValueList().get(30),scheme)); + dto.setV32(getData(type,valueType.getValueList().get(31),scheme)); + dto.setV33(getData(type,valueType.getValueList().get(32),scheme)); + dto.setV34(getData(type,valueType.getValueList().get(33),scheme)); + dto.setV35(getData(type,valueType.getValueList().get(34),scheme)); + dto.setV36(getData(type,valueType.getValueList().get(35),scheme)); + dto.setV37(getData(type,valueType.getValueList().get(36),scheme)); + dto.setV38(getData(type,valueType.getValueList().get(37),scheme)); + dto.setV39(getData(type,valueType.getValueList().get(38),scheme)); + dto.setV40(getData(type,valueType.getValueList().get(39),scheme)); + + dto.setV41(getData(type,valueType.getValueList().get(40),scheme)); + dto.setV42(getData(type,valueType.getValueList().get(41),scheme)); + dto.setV43(getData(type,valueType.getValueList().get(42),scheme)); + dto.setV44(getData(type,valueType.getValueList().get(43),scheme)); + dto.setV45(getData(type,valueType.getValueList().get(44),scheme)); + dto.setV46(getData(type,valueType.getValueList().get(45),scheme)); + dto.setV47(getData(type,valueType.getValueList().get(46),scheme)); + dto.setV48(getData(type,valueType.getValueList().get(47),scheme)); + dto.setV49(getData(type,valueType.getValueList().get(48),scheme)); + dto.setV50(getData(type,valueType.getValueList().get(49),scheme)); + } + + public void channelDataHarmPowerPHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataHarmPowerPDto dto, boolean scheme) { + CommonMinuteDto.ValueType valueType; + String type; + if (dto.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.CP95) && !scheme) { + valueType = pojo2; + type = "CP95"; + } else { + valueType = pojo1; + type = pojo1.getValueType(); + } + //按照指标集合排列顺序取值 + dto.setDf(getData(type,valueType.getValueList().get(0),scheme)); + dto.setPf(getData(type,valueType.getValueList().get(1),scheme)); + dto.setP(getData(type,valueType.getValueList().get(2),scheme)); + + dto.setP1(getData(type,valueType.getValueList().get(3),scheme)); + dto.setP2(getData(type,valueType.getValueList().get(4),scheme)); + dto.setP3(getData(type,valueType.getValueList().get(5),scheme)); + dto.setP4(getData(type,valueType.getValueList().get(6),scheme)); + dto.setP5(getData(type,valueType.getValueList().get(7),scheme)); + dto.setP6(getData(type,valueType.getValueList().get(8),scheme)); + dto.setP7(getData(type,valueType.getValueList().get(9),scheme)); + dto.setP8(getData(type,valueType.getValueList().get(10),scheme)); + dto.setP9(getData(type,valueType.getValueList().get(11),scheme)); + dto.setP10(getData(type,valueType.getValueList().get(12),scheme)); + dto.setP11(getData(type,valueType.getValueList().get(13),scheme)); + + dto.setP12(getData(type,valueType.getValueList().get(14),scheme)); + dto.setP13(getData(type,valueType.getValueList().get(15),scheme)); + dto.setP14(getData(type,valueType.getValueList().get(16),scheme)); + dto.setP15(getData(type,valueType.getValueList().get(17),scheme)); + dto.setP16(getData(type,valueType.getValueList().get(18),scheme)); + dto.setP17(getData(type,valueType.getValueList().get(19),scheme)); + dto.setP18(getData(type,valueType.getValueList().get(20),scheme)); + dto.setP19(getData(type,valueType.getValueList().get(21),scheme)); + dto.setP20(getData(type,valueType.getValueList().get(22),scheme)); + dto.setP21(getData(type,valueType.getValueList().get(23),scheme)); + + dto.setP22(getData(type,valueType.getValueList().get(24),scheme)); + dto.setP23(getData(type,valueType.getValueList().get(25),scheme)); + dto.setP24(getData(type,valueType.getValueList().get(26),scheme)); + dto.setP25(getData(type,valueType.getValueList().get(27),scheme)); + dto.setP26(getData(type,valueType.getValueList().get(28),scheme)); + dto.setP27(getData(type,valueType.getValueList().get(29),scheme)); + dto.setP28(getData(type,valueType.getValueList().get(30),scheme)); + dto.setP29(getData(type,valueType.getValueList().get(31),scheme)); + dto.setP30(getData(type,valueType.getValueList().get(32),scheme)); + dto.setP31(getData(type,valueType.getValueList().get(33),scheme)); + + dto.setP32(getData(type,valueType.getValueList().get(34),scheme)); + dto.setP33(getData(type,valueType.getValueList().get(35),scheme)); + dto.setP34(getData(type,valueType.getValueList().get(36),scheme)); + dto.setP35(getData(type,valueType.getValueList().get(37),scheme)); + dto.setP36(getData(type,valueType.getValueList().get(38),scheme)); + dto.setP37(getData(type,valueType.getValueList().get(39),scheme)); + dto.setP38(getData(type,valueType.getValueList().get(40),scheme)); + dto.setP39(getData(type,valueType.getValueList().get(41),scheme)); + dto.setP40(getData(type,valueType.getValueList().get(42),scheme)); + dto.setP41(getData(type,valueType.getValueList().get(43),scheme)); + + dto.setP42(getData(type,valueType.getValueList().get(44),scheme)); + dto.setP43(getData(type,valueType.getValueList().get(45),scheme)); + dto.setP44(getData(type,valueType.getValueList().get(46),scheme)); + dto.setP45(getData(type,valueType.getValueList().get(47),scheme)); + dto.setP46(getData(type,valueType.getValueList().get(48),scheme)); + dto.setP47(getData(type,valueType.getValueList().get(49),scheme)); + dto.setP48(getData(type,valueType.getValueList().get(50),scheme)); + dto.setP49(getData(type,valueType.getValueList().get(51),scheme)); + dto.setP50(getData(type,valueType.getValueList().get(52),scheme)); + } + + public void channelDataHarmPowerQHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataHarmPowerQDto dto, boolean scheme) { + CommonMinuteDto.ValueType valueType; + String type; + if (dto.getValueType().equalsIgnoreCase(InfluxDbSqlConstant.CP95) && !scheme) { + valueType = pojo2; + type = "CP95"; + } else { + valueType = pojo1; + type = pojo1.getValueType(); + } + //按照指标集合排列顺序取值 + dto.setQ(getData(type,valueType.getValueList().get(0),scheme)); + + dto.setQ1(getData(type,valueType.getValueList().get(1),scheme)); + dto.setQ2(getData(type,valueType.getValueList().get(2),scheme)); + dto.setQ3(getData(type,valueType.getValueList().get(3),scheme)); + dto.setQ4(getData(type,valueType.getValueList().get(4),scheme)); + dto.setQ5(getData(type,valueType.getValueList().get(5),scheme)); + dto.setQ6(getData(type,valueType.getValueList().get(6),scheme)); + dto.setQ7(getData(type,valueType.getValueList().get(7),scheme)); + dto.setQ8(getData(type,valueType.getValueList().get(8),scheme)); + dto.setQ9(getData(type,valueType.getValueList().get(9),scheme)); + dto.setQ10(getData(type,valueType.getValueList().get(10),scheme)); + + dto.setQ11(getData(type,valueType.getValueList().get(11),scheme)); + dto.setQ12(getData(type,valueType.getValueList().get(12),scheme)); + dto.setQ13(getData(type,valueType.getValueList().get(13),scheme)); + dto.setQ14(getData(type,valueType.getValueList().get(14),scheme)); + dto.setQ15(getData(type,valueType.getValueList().get(15),scheme)); + dto.setQ16(getData(type,valueType.getValueList().get(16),scheme)); + dto.setQ17(getData(type,valueType.getValueList().get(17),scheme)); + dto.setQ18(getData(type,valueType.getValueList().get(18),scheme)); + dto.setQ19(getData(type,valueType.getValueList().get(19),scheme)); + dto.setQ20(getData(type,valueType.getValueList().get(20),scheme)); + + dto.setQ21(getData(type,valueType.getValueList().get(21),scheme)); + dto.setQ22(getData(type,valueType.getValueList().get(22),scheme)); + dto.setQ23(getData(type,valueType.getValueList().get(23),scheme)); + dto.setQ24(getData(type,valueType.getValueList().get(24),scheme)); + dto.setQ25(getData(type,valueType.getValueList().get(25),scheme)); + dto.setQ26(getData(type,valueType.getValueList().get(26),scheme)); + dto.setQ27(getData(type,valueType.getValueList().get(27),scheme)); + dto.setQ28(getData(type,valueType.getValueList().get(28),scheme)); + dto.setQ29(getData(type,valueType.getValueList().get(29),scheme)); + dto.setQ30(getData(type,valueType.getValueList().get(30),scheme)); + + dto.setQ31(getData(type,valueType.getValueList().get(31),scheme)); + dto.setQ32(getData(type,valueType.getValueList().get(32),scheme)); + dto.setQ33(getData(type,valueType.getValueList().get(33),scheme)); + dto.setQ34(getData(type,valueType.getValueList().get(34),scheme)); + dto.setQ35(getData(type,valueType.getValueList().get(35),scheme)); + dto.setQ36(getData(type,valueType.getValueList().get(36),scheme)); + dto.setQ37(getData(type,valueType.getValueList().get(37),scheme)); + dto.setQ38(getData(type,valueType.getValueList().get(38),scheme)); + dto.setQ39(getData(type,valueType.getValueList().get(39),scheme)); + dto.setQ40(getData(type,valueType.getValueList().get(40),scheme)); + + dto.setQ41(getData(type,valueType.getValueList().get(41),scheme)); + dto.setQ42(getData(type,valueType.getValueList().get(42),scheme)); + dto.setQ43(getData(type,valueType.getValueList().get(43),scheme)); + dto.setQ44(getData(type,valueType.getValueList().get(44),scheme)); + dto.setQ45(getData(type,valueType.getValueList().get(45),scheme)); + dto.setQ46(getData(type,valueType.getValueList().get(46),scheme)); + dto.setQ47(getData(type,valueType.getValueList().get(47),scheme)); + dto.setQ48(getData(type,valueType.getValueList().get(48),scheme)); + dto.setQ49(getData(type,valueType.getValueList().get(49),scheme)); + dto.setQ50(getData(type,valueType.getValueList().get(50),scheme)); + } + //数据类型处理 //cp95值的计算有点区别，会用到cp95的集合或者平均值的集合 public Double getData(String valueType, List list, boolean scheme) { 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 75e5bdb..739a10b 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 @@ -5,7 +5,9 @@ import com.njcn.common.pojo.response.HttpResult; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,11 +22,15 @@ import java.util.List; @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataFlicker", fallbackFactory = DataFlickerFeignClientFallbackFactory.class, contextId = "dataFlicker") public interface DataFlickerFeignClient { - - @PostMapping("/batchInsertion") HttpResult batchInsertion(@RequestBody List dataFlickerDTOList); @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); } 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 ae411b5..dccbe55 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 @@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.fallback.DataFlucFeignClientFallbackFactory; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -27,4 +28,11 @@ public interface DataFlucFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); + } 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 4d95ba3..2115c08 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 @@ -5,6 +5,10 @@ import com.njcn.common.pojo.response.HttpResult; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,9 +23,13 @@ import java.util.List; @FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataHarmphasicI", fallbackFactory = DataHarmphasicIFeignClientFallbackFactory.class, contextId = "dataHarmphasicI") public interface DataHarmphasicIFeignClient { - - @PostMapping("/batchInsertion") HttpResult batchInsertion(@RequestBody List dataHarmphasicIDTOList); + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); + } 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 67c1c44..ad80014 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 @@ -5,7 +5,9 @@ import com.njcn.common.pojo.response.HttpResult; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -28,4 +30,10 @@ public interface DataHarmphasicVFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); + } 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 4afbb1f..88ce4ae 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 @@ -5,6 +5,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.fallback.DataHarmpowerPFeignClientFallbackFactory; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -25,4 +28,10 @@ public interface DataHarmpowerPFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); } 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 3db0a3d..4e7235e 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 @@ -2,9 +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.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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,4 +26,10 @@ public interface DataHarmpowerQFeignClient { @PostMapping("/batchInsertion") HttpResult batchInsertion(@RequestBody List dataHarmpowerQDTOList); + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List data); + } 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 c584052..f1312c1 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 @@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult; 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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -26,4 +27,9 @@ public interface DataIFeignClient { @PostMapping("/getRawData") HttpResult> getRawData(@RequestBody LineCountEvaluateParam lineParam); + @PostMapping("/getBaseData") + HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam); + + @PostMapping("/addList") + HttpResult addList(@RequestBody List dataIDtoList); } 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 761a973..27a31e2 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 @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataFlickerFeignClient; 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.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; @@ -52,6 +53,18 @@ public class DataFlickerFeignClientFallbackFactory implements FallbackFactory> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取算法基础数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + log.error("{}异常，降级处理，异常为：{}","存储数据",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 1435f38..8e6f72d 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 @@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataFlucFeignClient; 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.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; @@ -52,6 +53,18 @@ public class DataFlucFeignClientFallbackFactory implements FallbackFactory> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取算法原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + 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 3a78d60..5912783 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 @@ -6,6 +6,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmphasicIFeignClient; 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.DataHarmPhasicIDto; import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -44,6 +47,18 @@ public class DataHarmphasicIFeignClientFallbackFactory implements FallbackFactor throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取算法原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + 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 7658671..7f15a62 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 @@ -6,7 +6,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmphasicVFeignClient; 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 com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -51,6 +53,18 @@ public class DataHarmphasicVFeignClientFallbackFactory implements FallbackFactor throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + log.error("{}异常，降级处理，异常为：{}","日表存储数据",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 fc67d94..313f483 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 @@ -6,6 +6,8 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmpowerPFeignClient; 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.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; import com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; @@ -51,6 +53,18 @@ public class DataHarmpowerPFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + 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 a55aba4..7ddc8be 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 @@ -5,6 +5,9 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataHarmpowerQFeignClient; 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 com.njcn.dataProcess.util.DataProcessingEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -43,6 +46,18 @@ public class DataHarmpowerQFeignClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取预处理数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List data) { + log.error("{}异常，降级处理，异常为：{}","日表存储数据",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 6a49473..1c11019 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 @@ -6,9 +6,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.dataProcess.api.DataIFeignClient; 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.util.DataProcessingEnumUtil; -import com.njcn.system.utils.SystemEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -52,6 +52,18 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory> getBaseData(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","获取算法基础数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult addList(List dataIDtoList) { + log.error("{}异常，降级处理，异常为：{}","关系型数据库插入数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicIDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicIDto.java new file mode 100644 index 0000000..657e8c9 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicIDto.java @@ -0,0 +1,145 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmPhasicIDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("基波电流相角") + private Double i1; + + @ApiModelProperty("2次谐波电流相角") + private Double i2; + + @ApiModelProperty("3次谐波电流相角") + private Double i3; + + @ApiModelProperty("4次谐波电流相角") + private Double i4; + + @ApiModelProperty("5次谐波电流相角") + private Double i5; + + @ApiModelProperty("6次谐波电流相角") + private Double i6; + + @ApiModelProperty("7次谐波电流相角") + private Double i7; + + @ApiModelProperty("8次谐波电流相角") + private Double i8; + + private Double i9; + + private Double i10; + + private Double i11; + + private Double i12; + + private Double i13; + + private Double i14; + + private Double i15; + + private Double i16; + + private Double i17; + + private Double i18; + + private Double i19; + + private Double i20; + + private Double i21; + + private Double i22; + + private Double i23; + + private Double i24; + + private Double i25; + + private Double i26; + + private Double i27; + + private Double i28; + + private Double i29; + + private Double i30; + + private Double i31; + + private Double i32; + + private Double i33; + + private Double i34; + + private Double i35; + + private Double i36; + + private Double i37; + + private Double i38; + + private Double i39; + + private Double i40; + + private Double i41; + + private Double i42; + + private Double i43; + + private Double i44; + + private Double i45; + + private Double i46; + + private Double i47; + + private Double i48; + + private Double i49; + + @ApiModelProperty("50次谐波电流相角") + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicVDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicVDto.java new file mode 100644 index 0000000..321ec29 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPhasicVDto.java @@ -0,0 +1,146 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmPhasicVDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("基波电压相角") + private Double v1; + + @ApiModelProperty("2次谐波电压相角") + private Double v2; + + @ApiModelProperty("3次谐波电压相角") + private Double v3; + + @ApiModelProperty("4次谐波电压相角") + private Double v4; + + @ApiModelProperty("5次谐波电压相角") + private Double v5; + + @ApiModelProperty("6次谐波电压相角") + private Double v6; + + @ApiModelProperty("7次谐波电压相角") + private Double v7; + + @ApiModelProperty("8次谐波电压相角") + private Double v8; + + private Double v9; + + private Double v10; + + private Double v11; + + private Double v12; + + private Double v13; + + private Double v14; + + private Double v15; + + private Double v16; + + private Double v17; + + private Double v18; + + private Double v19; + + private Double v20; + + private Double v21; + + private Double v22; + + private Double v23; + + private Double v24; + + private Double v25; + + private Double v26; + + private Double v27; + + private Double v28; + + private Double v29; + + private Double v30; + + private Double v31; + + private Double v32; + + private Double v33; + + private Double v34; + + private Double v35; + + private Double v36; + + private Double v37; + + private Double v38; + + private Double v39; + + private Double v40; + + private Double v41; + + private Double v42; + + private Double v43; + + private Double v44; + + private Double v45; + + private Double v46; + + private Double v47; + + private Double v48; + + private Double v49; + + @ApiModelProperty("50次谐波电压相角") + private Double v50; + + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerPDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerPDto.java new file mode 100644 index 0000000..1027ddf --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerPDto.java @@ -0,0 +1,153 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmPowerPDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("视在功率因素") + private Double pf; + + @ApiModelProperty("位移功率因数") + private Double df; + + @ApiModelProperty("总有功功率") + private Double p; + + @ApiModelProperty("基波有功功率") + private Double p1; + + @ApiModelProperty("2次谐波有功功率") + private Double p2; + + @ApiModelProperty("3次谐波有功功率") + private Double p3; + + @ApiModelProperty("4次谐波有功功率") + private Double p4; + + @ApiModelProperty("5次谐波有功功率") + private Double p5; + + @ApiModelProperty("6次谐波有功功率") + private Double p6; + + @ApiModelProperty("7次谐波有功功率") + private Double p7; + + @ApiModelProperty("8次谐波有功功率") + private Double p8; + + private Double p9; + + private Double p10; + + private Double p11; + + private Double p12; + + private Double p13; + + private Double p14; + + private Double p15; + + private Double p16; + + private Double p17; + + private Double p18; + + private Double p19; + + private Double p20; + + private Double p21; + + private Double p22; + + private Double p23; + + private Double p24; + + private Double p25; + + private Double p26; + + private Double p27; + + private Double p28; + + private Double p29; + + private Double p30; + + private Double p31; + + private Double p32; + + private Double p33; + + private Double p34; + + private Double p35; + + private Double p36; + + private Double p37; + + private Double p38; + + private Double p39; + + private Double p40; + + private Double p41; + + private Double p42; + + private Double p43; + + private Double p44; + + private Double p45; + + private Double p46; + + private Double p47; + + private Double p48; + + private Double p49; + + @ApiModelProperty("50次谐波有功功率") + private Double p50; +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerQDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerQDto.java new file mode 100644 index 0000000..a117fcb --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerQDto.java @@ -0,0 +1,147 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmPowerQDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("总无功功率") + private Double q; + + @ApiModelProperty("基波无功功率") + private Double q1; + + @ApiModelProperty("2次谐波无功功率") + private Double q2; + + @ApiModelProperty("3次谐波无功功率") + private Double q3; + + @ApiModelProperty("4次谐波无功功率") + private Double q4; + + @ApiModelProperty("5次谐波无功功率") + private Double q5; + + @ApiModelProperty("6次谐波无功功率") + private Double q6; + + @ApiModelProperty("7次谐波无功功率") + private Double q7; + + @ApiModelProperty("8次谐波无功功率") + private Double q8; + + private Double q9; + + private Double q10; + + private Double q11; + + private Double q12; + + private Double q13; + + private Double q14; + + private Double q15; + + private Double q16; + + private Double q17; + + private Double q18; + + private Double q19; + + private Double q20; + + private Double q21; + + private Double q22; + + private Double q23; + + private Double q24; + + private Double q25; + + private Double q26; + + private Double q27; + + private Double q28; + + private Double q29; + + private Double q30; + + private Double q31; + + private Double q32; + + private Double q33; + + private Double q34; + + private Double q35; + + private Double q36; + + private Double q37; + + private Double q38; + + private Double q39; + + private Double q40; + + private Double q41; + + private Double q42; + + private Double q43; + + private Double q44; + + private Double q45; + + private Double q46; + + private Double q47; + + private Double q48; + + private Double q49; + + @ApiModelProperty("50次谐波无功功率") + private Double q50; +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerSDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerSDto.java new file mode 100644 index 0000000..3d85ad0 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmPowerSDto.java @@ -0,0 +1,147 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmPowerSDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("总视在功率") + private Double s; + + @ApiModelProperty("基波视在功率") + private Double s1; + + @ApiModelProperty("2次谐波视在功率") + private Double s2; + + @ApiModelProperty("3次谐波视在功率") + private Double s3; + + @ApiModelProperty("4次谐波视在功率") + private Double s4; + + @ApiModelProperty("5次谐波视在功率") + private Double s5; + + @ApiModelProperty("6次谐波视在功率") + private Double s6; + + @ApiModelProperty("7次谐波视在功率") + private Double s7; + + @ApiModelProperty("8次谐波视在功率") + private Double s8; + + private Double s9; + + private Double s10; + + private Double s11; + + private Double s12; + + private Double s13; + + private Double s14; + + private Double s15; + + private Double s16; + + private Double s17; + + private Double s18; + + private Double s19; + + private Double s20; + + private Double s21; + + private Double s22; + + private Double s23; + + private Double s24; + + private Double s25; + + private Double s26; + + private Double s27; + + private Double s28; + + private Double s29; + + private Double s30; + + private Double s31; + + private Double s32; + + private Double s33; + + private Double s34; + + private Double s35; + + private Double s36; + + private Double s37; + + private Double s38; + + private Double s39; + + private Double s40; + + private Double s41; + + private Double s42; + + private Double s43; + + private Double s44; + + private Double s45; + + private Double s46; + + private Double s47; + + private Double s48; + + private Double s49; + + @ApiModelProperty("50次谐波视在功率") + private Double s50; +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateIDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateIDto.java new file mode 100644 index 0000000..edc5edb --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateIDto.java @@ -0,0 +1,145 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmRateIDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("基波电流含有率") + private Double i1; + + @ApiModelProperty("2次谐波电流含有率") + private Double i2; + + @ApiModelProperty("3次谐波电流含有率") + private Double i3; + + @ApiModelProperty("4次谐波电流含有率") + private Double i4; + + @ApiModelProperty("5次谐波电流含有率") + private Double i5; + + @ApiModelProperty("6次谐波电流含有率") + private Double i6; + + @ApiModelProperty("7次谐波电流含有率") + private Double i7; + + @ApiModelProperty("8次谐波电流含有率") + private Double i8; + + private Double i9; + + private Double i10; + + private Double i11; + + private Double i12; + + private Double i13; + + private Double i14; + + private Double i15; + + private Double i16; + + private Double i17; + + private Double i18; + + private Double i19; + + private Double i20; + + private Double i21; + + private Double i22; + + private Double i23; + + private Double i24; + + private Double i25; + + private Double i26; + + private Double i27; + + private Double i28; + + private Double i29; + + private Double i30; + + private Double i31; + + private Double i32; + + private Double i33; + + private Double i34; + + private Double i35; + + private Double i36; + + private Double i37; + + private Double i38; + + private Double i39; + + private Double i40; + + private Double i41; + + private Double i42; + + private Double i43; + + private Double i44; + + private Double i45; + + private Double i46; + + private Double i47; + + private Double i48; + + private Double i49; + + @ApiModelProperty("50次谐波电流含有率") + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVDto.java new file mode 100644 index 0000000..53dfe97 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataHarmRateVDto.java @@ -0,0 +1,145 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataHarmRateVDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("基波电压含有率") + private Double v1; + + @ApiModelProperty("2次谐波电压含有率") + private Double v2; + + @ApiModelProperty("3次谐波电压含有率") + private Double v3; + + @ApiModelProperty("4次谐波电压含有率") + private Double v4; + + @ApiModelProperty("5次谐波电压含有率") + private Double v5; + + @ApiModelProperty("6次谐波电压含有率") + private Double v6; + + @ApiModelProperty("7次谐波电压含有率") + private Double v7; + + @ApiModelProperty("8次谐波电压含有率") + private Double v8; + + private Double v9; + + private Double v10; + + private Double v11; + + private Double v12; + + private Double v13; + + private Double v14; + + private Double v15; + + private Double v16; + + private Double v17; + + private Double v18; + + private Double v19; + + private Double v20; + + private Double v21; + + private Double v22; + + private Double v23; + + private Double v24; + + private Double v25; + + private Double v26; + + private Double v27; + + private Double v28; + + private Double v29; + + private Double v30; + + private Double v31; + + private Double v32; + + private Double v33; + + private Double v34; + + private Double v35; + + private Double v36; + + private Double v37; + + private Double v38; + + private Double v39; + + private Double v40; + + private Double v41; + + private Double v42; + + private Double v43; + + private Double v44; + + private Double v45; + + private Double v46; + + private Double v47; + + private Double v48; + + private Double v49; + + @ApiModelProperty("50次谐波电压含有率") + private Double v50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmIDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmIDto.java new file mode 100644 index 0000000..0ebb88f --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmIDto.java @@ -0,0 +1,145 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataInHarmIDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("0.5次间谐波电流幅值") + private Double i1; + + @ApiModelProperty("1.5次间谐波电流幅值") + private Double i2; + + @ApiModelProperty("2.5次间谐波电流幅值") + private Double i3; + + @ApiModelProperty("3.5次间谐波电流幅值") + private Double i4; + + @ApiModelProperty("4.5次间谐波电流幅值") + private Double i5; + + @ApiModelProperty("5.5次间谐波电流幅值") + private Double i6; + + @ApiModelProperty("6.5次间谐波电流幅值") + private Double i7; + + @ApiModelProperty("7.5次间谐波电流幅值") + private Double i8; + + private Double i9; + + private Double i10; + + private Double i11; + + private Double i12; + + private Double i13; + + private Double i14; + + private Double i15; + + private Double i16; + + private Double i17; + + private Double i18; + + private Double i19; + + private Double i20; + + private Double i21; + + private Double i22; + + private Double i23; + + private Double i24; + + private Double i25; + + private Double i26; + + private Double i27; + + private Double i28; + + private Double i29; + + private Double i30; + + private Double i31; + + private Double i32; + + private Double i33; + + private Double i34; + + private Double i35; + + private Double i36; + + private Double i37; + + private Double i38; + + private Double i39; + + private Double i40; + + private Double i41; + + private Double i42; + + private Double i43; + + private Double i44; + + private Double i45; + + private Double i46; + + private Double i47; + + private Double i48; + + private Double i49; + + @ApiModelProperty("49.5次间谐波电流幅值") + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmVDto.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmVDto.java new file mode 100644 index 0000000..00ccf19 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataInHarmVDto.java @@ -0,0 +1,145 @@ +package com.njcn.dataProcess.pojo.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xy + */ +@Data +public class DataInHarmVDto implements Serializable { + + @JsonFormat(pattern = "yyyy-MM-dd") + private String time; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String minTime; + + @ApiModelProperty("监测点Id") + private String lineId; + + @ApiModelProperty("相别,'A'表示A相，'B'表示B相,'C'表示C相,'T'表示总, 'M'表示无相别") + private String phasicType; + + @ApiModelProperty("数据类型 最大值：max、最小值：min、平均值：avg、95值：cp95") + private String valueType; + + @ApiModelProperty("数据质量标志（0-表示是正常数据、1-表示是错误数据、2-表示是有事件的数据）数据库默认是0，污染数据不参与报表统计") + private String qualityFlag; + + @ApiModelProperty("数据清洗标识 0:正常 1:异常") + private Integer abnormalFlag; + + @ApiModelProperty("0.5次间谐波电压幅值") + private Double v1; + + @ApiModelProperty("1.5次间谐波电压幅值") + private Double v2; + + @ApiModelProperty("2.5次间谐波电压幅值") + private Double v3; + + @ApiModelProperty("3.5次间谐波电压幅值") + private Double v4; + + @ApiModelProperty("4.5次间谐波电压幅值") + private Double v5; + + @ApiModelProperty("5.5次间谐波电压幅值") + private Double v6; + + @ApiModelProperty("6.5次间谐波电压幅值") + private Double v7; + + @ApiModelProperty("7.5次间谐波电压幅值") + private Double v8; + + private Double v9; + + private Double v10; + + private Double v11; + + private Double v12; + + private Double v13; + + private Double v14; + + private Double v15; + + private Double v16; + + private Double v17; + + private Double v18; + + private Double v19; + + private Double v20; + + private Double v21; + + private Double v22; + + private Double v23; + + private Double v24; + + private Double v25; + + private Double v26; + + private Double v27; + + private Double v28; + + private Double v29; + + private Double v30; + + private Double v31; + + private Double v32; + + private Double v33; + + private Double v34; + + private Double v35; + + private Double v36; + + private Double v37; + + private Double v38; + + private Double v39; + + private Double v40; + + private Double v41; + + private Double v42; + + private Double v43; + + private Double v44; + + private Double v45; + + private Double v46; + + private Double v47; + + private Double v48; + + private Double v49; + + @ApiModelProperty("49.5次间谐波电压幅值") + private Double v50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlickerD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlickerD.java new file mode 100644 index 0000000..415ff5a --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlickerD.java @@ -0,0 +1,50 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "r_stat_data_flicker_d") +public class RStatDataFlickerD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "fluc",updateStrategy = FieldStrategy.IGNORED) + private Double fluc; + + @TableField(value = "plt",updateStrategy = FieldStrategy.IGNORED) + private Double plt; + + @TableField(value = "pst",updateStrategy = FieldStrategy.IGNORED) + private Double pst; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlucD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlucD.java new file mode 100644 index 0000000..80fcad1 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataFlucD.java @@ -0,0 +1,47 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "r_stat_data_fluc_d") +public class RStatDataFlucD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "fluc",updateStrategy = FieldStrategy.IGNORED) + private Double fluc; + + @TableField(value = "fluccf",updateStrategy = FieldStrategy.IGNORED) + private Double fluccf; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicID.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicID.java new file mode 100644 index 0000000..7790440 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicID.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMPHASIC_I_D") +public class RStatDataHarmPhasicID implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED) + private Double i1; + + @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED) + private Double i2; + + @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED) + private Double i3; + + @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED) + private Double i4; + + @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED) + private Double i5; + + @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED) + private Double i6; + + @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED) + private Double i7; + + @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED) + private Double i8; + + @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED) + private Double i9; + + @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED) + private Double i10; + + @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED) + private Double i11; + + @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED) + private Double i12; + + @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED) + private Double i13; + + @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED) + private Double i14; + + @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED) + private Double i15; + + @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED) + private Double i16; + + @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED) + private Double i17; + + @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED) + private Double i18; + + @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED) + private Double i19; + + @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED) + private Double i20; + + @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED) + private Double i21; + + @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED) + private Double i22; + + @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED) + private Double i23; + + @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED) + private Double i24; + + @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED) + private Double i25; + + @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED) + private Double i26; + + @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED) + private Double i27; + + @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED) + private Double i28; + + @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED) + private Double i29; + + @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED) + private Double i30; + + @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED) + private Double i31; + + @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED) + private Double i32; + + @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED) + private Double i33; + + @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED) + private Double i34; + + @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED) + private Double i35; + + @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED) + private Double i36; + + @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED) + private Double i37; + + @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED) + private Double i38; + + @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED) + private Double i39; + + @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED) + private Double i40; + + @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED) + private Double i41; + + @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED) + private Double i42; + + @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED) + private Double i43; + + @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED) + private Double i44; + + @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED) + private Double i45; + + @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED) + private Double i46; + + @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED) + private Double i47; + + @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED) + private Double i48; + + @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED) + private Double i49; + + @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED) + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicVD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicVD.java new file mode 100644 index 0000000..acbda03 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPhasicVD.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMPHASIC_V_D") +public class RStatDataHarmPhasicVD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED) + private Double v1; + + @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED) + private Double v2; + + @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED) + private Double v3; + + @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED) + private Double v4; + + @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED) + private Double v5; + + @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED) + private Double v6; + + @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED) + private Double v7; + + @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED) + private Double v8; + + @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED) + private Double v9; + + @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED) + private Double v10; + + @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED) + private Double v11; + + @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED) + private Double v12; + + @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED) + private Double v13; + + @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED) + private Double v14; + + @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED) + private Double v15; + + @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED) + private Double v16; + + @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED) + private Double v17; + + @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED) + private Double v18; + + @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED) + private Double v19; + + @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED) + private Double v20; + + @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED) + private Double v21; + + @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED) + private Double v22; + + @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED) + private Double v23; + + @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED) + private Double v24; + + @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED) + private Double v25; + + @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED) + private Double v26; + + @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED) + private Double v27; + + @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED) + private Double v28; + + @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED) + private Double v29; + + @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED) + private Double v30; + + @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED) + private Double v31; + + @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED) + private Double v32; + + @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED) + private Double v33; + + @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED) + private Double v34; + + @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED) + private Double v35; + + @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED) + private Double v36; + + @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED) + private Double v37; + + @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED) + private Double v38; + + @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED) + private Double v39; + + @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED) + private Double v40; + + @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED) + private Double v41; + + @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED) + private Double v42; + + @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED) + private Double v43; + + @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED) + private Double v44; + + @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED) + private Double v45; + + @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED) + private Double v46; + + @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED) + private Double v47; + + @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED) + private Double v48; + + @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED) + private Double v49; + + @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED) + private Double v50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerPD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerPD.java new file mode 100644 index 0000000..f41260e --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerPD.java @@ -0,0 +1,200 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMPOWER_P_D") +public class RStatDataHarmPowerPD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "p",updateStrategy = FieldStrategy.IGNORED) + private Double p; + + @TableField(value = "pf",updateStrategy = FieldStrategy.IGNORED) + private Double pf; + + @TableField(value = "df",updateStrategy = FieldStrategy.IGNORED) + private Double df; + + @TableField(value = "p_1",updateStrategy = FieldStrategy.IGNORED) + private Double p1; + + @TableField(value = "p_2",updateStrategy = FieldStrategy.IGNORED) + private Double p2; + + @TableField(value = "p_3",updateStrategy = FieldStrategy.IGNORED) + private Double p3; + + @TableField(value = "p_4",updateStrategy = FieldStrategy.IGNORED) + private Double p4; + + @TableField(value = "p_5",updateStrategy = FieldStrategy.IGNORED) + private Double p5; + + @TableField(value = "p_6",updateStrategy = FieldStrategy.IGNORED) + private Double p6; + + @TableField(value = "p_7",updateStrategy = FieldStrategy.IGNORED) + private Double p7; + + @TableField(value = "p_8",updateStrategy = FieldStrategy.IGNORED) + private Double p8; + + @TableField(value = "p_9",updateStrategy = FieldStrategy.IGNORED) + private Double p9; + + @TableField(value = "p_10",updateStrategy = FieldStrategy.IGNORED) + private Double p10; + + @TableField(value = "p_11",updateStrategy = FieldStrategy.IGNORED) + private Double p11; + + @TableField(value = "p_12",updateStrategy = FieldStrategy.IGNORED) + private Double p12; + + @TableField(value = "p_13",updateStrategy = FieldStrategy.IGNORED) + private Double p13; + + @TableField(value = "p_14",updateStrategy = FieldStrategy.IGNORED) + private Double p14; + + @TableField(value = "p_15",updateStrategy = FieldStrategy.IGNORED) + private Double p15; + + @TableField(value = "p_16",updateStrategy = FieldStrategy.IGNORED) + private Double p16; + + @TableField(value = "p_17",updateStrategy = FieldStrategy.IGNORED) + private Double p17; + + @TableField(value = "p_18",updateStrategy = FieldStrategy.IGNORED) + private Double p18; + + @TableField(value = "p_19",updateStrategy = FieldStrategy.IGNORED) + private Double p19; + + @TableField(value = "p_20",updateStrategy = FieldStrategy.IGNORED) + private Double p20; + + @TableField(value = "p_21",updateStrategy = FieldStrategy.IGNORED) + private Double p21; + + @TableField(value = "p_22",updateStrategy = FieldStrategy.IGNORED) + private Double p22; + + @TableField(value = "p_23",updateStrategy = FieldStrategy.IGNORED) + private Double p23; + + @TableField(value = "p_24",updateStrategy = FieldStrategy.IGNORED) + private Double p24; + + @TableField(value = "p_25",updateStrategy = FieldStrategy.IGNORED) + private Double p25; + + @TableField(value = "p_26",updateStrategy = FieldStrategy.IGNORED) + private Double p26; + + @TableField(value = "p_27",updateStrategy = FieldStrategy.IGNORED) + private Double p27; + + @TableField(value = "p_28",updateStrategy = FieldStrategy.IGNORED) + private Double p28; + + @TableField(value = "p_29",updateStrategy = FieldStrategy.IGNORED) + private Double p29; + + @TableField(value = "p_30",updateStrategy = FieldStrategy.IGNORED) + private Double p30; + + @TableField(value = "p_31",updateStrategy = FieldStrategy.IGNORED) + private Double p31; + + @TableField(value = "p_32",updateStrategy = FieldStrategy.IGNORED) + private Double p32; + + @TableField(value = "p_33",updateStrategy = FieldStrategy.IGNORED) + private Double p33; + + @TableField(value = "p_34",updateStrategy = FieldStrategy.IGNORED) + private Double p34; + + @TableField(value = "p_35",updateStrategy = FieldStrategy.IGNORED) + private Double p35; + + @TableField(value = "p_36",updateStrategy = FieldStrategy.IGNORED) + private Double p36; + + @TableField(value = "p_37",updateStrategy = FieldStrategy.IGNORED) + private Double p37; + + @TableField(value = "p_38",updateStrategy = FieldStrategy.IGNORED) + private Double p38; + + @TableField(value = "p_39",updateStrategy = FieldStrategy.IGNORED) + private Double p39; + + @TableField(value = "p_40",updateStrategy = FieldStrategy.IGNORED) + private Double p40; + + @TableField(value = "p_41",updateStrategy = FieldStrategy.IGNORED) + private Double p41; + + @TableField(value = "p_42",updateStrategy = FieldStrategy.IGNORED) + private Double p42; + + @TableField(value = "p_43",updateStrategy = FieldStrategy.IGNORED) + private Double p43; + + @TableField(value = "p_44",updateStrategy = FieldStrategy.IGNORED) + private Double p44; + + @TableField(value = "p_45",updateStrategy = FieldStrategy.IGNORED) + private Double p45; + + @TableField(value = "p_46",updateStrategy = FieldStrategy.IGNORED) + private Double p46; + + @TableField(value = "p_47",updateStrategy = FieldStrategy.IGNORED) + private Double p47; + + @TableField(value = "p_48",updateStrategy = FieldStrategy.IGNORED) + private Double p48; + + @TableField(value = "p_49",updateStrategy = FieldStrategy.IGNORED) + private Double p49; + + @TableField(value = "p_50",updateStrategy = FieldStrategy.IGNORED) + private Double p50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerQD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerQD.java new file mode 100644 index 0000000..aec6148 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerQD.java @@ -0,0 +1,194 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMPOWER_Q_D") +public class RStatDataHarmPowerQD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "q",updateStrategy = FieldStrategy.IGNORED) + private Double q; + + @TableField(value = "q_1",updateStrategy = FieldStrategy.IGNORED) + private Double q1; + + @TableField(value = "q_2",updateStrategy = FieldStrategy.IGNORED) + private Double q2; + + @TableField(value = "q_3",updateStrategy = FieldStrategy.IGNORED) + private Double q3; + + @TableField(value = "q_4",updateStrategy = FieldStrategy.IGNORED) + private Double q4; + + @TableField(value = "q_5",updateStrategy = FieldStrategy.IGNORED) + private Double q5; + + @TableField(value = "q_6",updateStrategy = FieldStrategy.IGNORED) + private Double q6; + + @TableField(value = "q_7",updateStrategy = FieldStrategy.IGNORED) + private Double q7; + + @TableField(value = "q_8",updateStrategy = FieldStrategy.IGNORED) + private Double q8; + + @TableField(value = "q_9",updateStrategy = FieldStrategy.IGNORED) + private Double q9; + + @TableField(value = "q_10",updateStrategy = FieldStrategy.IGNORED) + private Double q10; + + @TableField(value = "q_11",updateStrategy = FieldStrategy.IGNORED) + private Double q11; + + @TableField(value = "q_12",updateStrategy = FieldStrategy.IGNORED) + private Double q12; + + @TableField(value = "q_13",updateStrategy = FieldStrategy.IGNORED) + private Double q13; + + @TableField(value = "q_14",updateStrategy = FieldStrategy.IGNORED) + private Double q14; + + @TableField(value = "q_15",updateStrategy = FieldStrategy.IGNORED) + private Double q15; + + @TableField(value = "q_16",updateStrategy = FieldStrategy.IGNORED) + private Double q16; + + @TableField(value = "q_17",updateStrategy = FieldStrategy.IGNORED) + private Double q17; + + @TableField(value = "q_18",updateStrategy = FieldStrategy.IGNORED) + private Double q18; + + @TableField(value = "q_19",updateStrategy = FieldStrategy.IGNORED) + private Double q19; + + @TableField(value = "q_20",updateStrategy = FieldStrategy.IGNORED) + private Double q20; + + @TableField(value = "q_21",updateStrategy = FieldStrategy.IGNORED) + private Double q21; + + @TableField(value = "q_22",updateStrategy = FieldStrategy.IGNORED) + private Double q22; + + @TableField(value = "q_23",updateStrategy = FieldStrategy.IGNORED) + private Double q23; + + @TableField(value = "q_24",updateStrategy = FieldStrategy.IGNORED) + private Double q24; + + @TableField(value = "q_25",updateStrategy = FieldStrategy.IGNORED) + private Double q25; + + @TableField(value = "q_26",updateStrategy = FieldStrategy.IGNORED) + private Double q26; + + @TableField(value = "q_27",updateStrategy = FieldStrategy.IGNORED) + private Double q27; + + @TableField(value = "q_28",updateStrategy = FieldStrategy.IGNORED) + private Double q28; + + @TableField(value = "q_29",updateStrategy = FieldStrategy.IGNORED) + private Double q29; + + @TableField(value = "q_30",updateStrategy = FieldStrategy.IGNORED) + private Double q30; + + @TableField(value = "q_31",updateStrategy = FieldStrategy.IGNORED) + private Double q31; + + @TableField(value = "q_32",updateStrategy = FieldStrategy.IGNORED) + private Double q32; + + @TableField(value = "q_33",updateStrategy = FieldStrategy.IGNORED) + private Double q33; + + @TableField(value = "q_34",updateStrategy = FieldStrategy.IGNORED) + private Double q34; + + @TableField(value = "q_35",updateStrategy = FieldStrategy.IGNORED) + private Double q35; + + @TableField(value = "q_36",updateStrategy = FieldStrategy.IGNORED) + private Double q36; + + @TableField(value = "q_37",updateStrategy = FieldStrategy.IGNORED) + private Double q37; + + @TableField(value = "q_38",updateStrategy = FieldStrategy.IGNORED) + private Double q38; + + @TableField(value = "q_39",updateStrategy = FieldStrategy.IGNORED) + private Double q39; + + @TableField(value = "q_40",updateStrategy = FieldStrategy.IGNORED) + private Double q40; + + @TableField(value = "q_41",updateStrategy = FieldStrategy.IGNORED) + private Double q41; + + @TableField(value = "q_42",updateStrategy = FieldStrategy.IGNORED) + private Double q42; + + @TableField(value = "q_43",updateStrategy = FieldStrategy.IGNORED) + private Double q43; + + @TableField(value = "q_44",updateStrategy = FieldStrategy.IGNORED) + private Double q44; + + @TableField(value = "q_45",updateStrategy = FieldStrategy.IGNORED) + private Double q45; + + @TableField(value = "q_46",updateStrategy = FieldStrategy.IGNORED) + private Double q46; + + @TableField(value = "q_47",updateStrategy = FieldStrategy.IGNORED) + private Double q47; + + @TableField(value = "q_48",updateStrategy = FieldStrategy.IGNORED) + private Double q48; + + @TableField(value = "q_49",updateStrategy = FieldStrategy.IGNORED) + private Double q49; + + @TableField(value = "q_50",updateStrategy = FieldStrategy.IGNORED) + private Double q50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerSD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerSD.java new file mode 100644 index 0000000..391942f --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmPowerSD.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMPOWER_S_D") +public class RStatDataHarmPowerSD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "s_1",updateStrategy = FieldStrategy.IGNORED) + private Double s1; + + @TableField(value = "s_2",updateStrategy = FieldStrategy.IGNORED) + private Double s2; + + @TableField(value = "s_3",updateStrategy = FieldStrategy.IGNORED) + private Double s3; + + @TableField(value = "s_4",updateStrategy = FieldStrategy.IGNORED) + private Double s4; + + @TableField(value = "s_5",updateStrategy = FieldStrategy.IGNORED) + private Double s5; + + @TableField(value = "s_6",updateStrategy = FieldStrategy.IGNORED) + private Double s6; + + @TableField(value = "s_7",updateStrategy = FieldStrategy.IGNORED) + private Double s7; + + @TableField(value = "s_8",updateStrategy = FieldStrategy.IGNORED) + private Double s8; + + @TableField(value = "s_9",updateStrategy = FieldStrategy.IGNORED) + private Double s9; + + @TableField(value = "s_10",updateStrategy = FieldStrategy.IGNORED) + private Double s10; + + @TableField(value = "s_11",updateStrategy = FieldStrategy.IGNORED) + private Double s11; + + @TableField(value = "s_12",updateStrategy = FieldStrategy.IGNORED) + private Double s12; + + @TableField(value = "s_13",updateStrategy = FieldStrategy.IGNORED) + private Double s13; + + @TableField(value = "s_14",updateStrategy = FieldStrategy.IGNORED) + private Double s14; + + @TableField(value = "s_15",updateStrategy = FieldStrategy.IGNORED) + private Double s15; + + @TableField(value = "s_16",updateStrategy = FieldStrategy.IGNORED) + private Double s16; + + @TableField(value = "s_17",updateStrategy = FieldStrategy.IGNORED) + private Double s17; + + @TableField(value = "s_18",updateStrategy = FieldStrategy.IGNORED) + private Double s18; + + @TableField(value = "s_19",updateStrategy = FieldStrategy.IGNORED) + private Double s19; + + @TableField(value = "s_20",updateStrategy = FieldStrategy.IGNORED) + private Double s20; + + @TableField(value = "s_21",updateStrategy = FieldStrategy.IGNORED) + private Double s21; + + @TableField(value = "s_22",updateStrategy = FieldStrategy.IGNORED) + private Double s22; + + @TableField(value = "s_23",updateStrategy = FieldStrategy.IGNORED) + private Double s23; + + @TableField(value = "s_24",updateStrategy = FieldStrategy.IGNORED) + private Double s24; + + @TableField(value = "s_25",updateStrategy = FieldStrategy.IGNORED) + private Double s25; + + @TableField(value = "s_26",updateStrategy = FieldStrategy.IGNORED) + private Double s26; + + @TableField(value = "s_27",updateStrategy = FieldStrategy.IGNORED) + private Double s27; + + @TableField(value = "s_28",updateStrategy = FieldStrategy.IGNORED) + private Double s28; + + @TableField(value = "s_29",updateStrategy = FieldStrategy.IGNORED) + private Double s29; + + @TableField(value = "s_30",updateStrategy = FieldStrategy.IGNORED) + private Double s30; + + @TableField(value = "s_31",updateStrategy = FieldStrategy.IGNORED) + private Double s31; + + @TableField(value = "s_32",updateStrategy = FieldStrategy.IGNORED) + private Double s32; + + @TableField(value = "s_33",updateStrategy = FieldStrategy.IGNORED) + private Double s33; + + @TableField(value = "s_34",updateStrategy = FieldStrategy.IGNORED) + private Double s34; + + @TableField(value = "s_35",updateStrategy = FieldStrategy.IGNORED) + private Double s35; + + @TableField(value = "s_36",updateStrategy = FieldStrategy.IGNORED) + private Double s36; + + @TableField(value = "s_37",updateStrategy = FieldStrategy.IGNORED) + private Double s37; + + @TableField(value = "s_38",updateStrategy = FieldStrategy.IGNORED) + private Double s38; + + @TableField(value = "s_39",updateStrategy = FieldStrategy.IGNORED) + private Double s39; + + @TableField(value = "s_40",updateStrategy = FieldStrategy.IGNORED) + private Double s40; + + @TableField(value = "s_41",updateStrategy = FieldStrategy.IGNORED) + private Double s41; + + @TableField(value = "s_42",updateStrategy = FieldStrategy.IGNORED) + private Double s42; + + @TableField(value = "s_43",updateStrategy = FieldStrategy.IGNORED) + private Double s43; + + @TableField(value = "s_44",updateStrategy = FieldStrategy.IGNORED) + private Double s44; + + @TableField(value = "s_45",updateStrategy = FieldStrategy.IGNORED) + private Double s45; + + @TableField(value = "s_46",updateStrategy = FieldStrategy.IGNORED) + private Double s46; + + @TableField(value = "s_47",updateStrategy = FieldStrategy.IGNORED) + private Double s47; + + @TableField(value = "s_48",updateStrategy = FieldStrategy.IGNORED) + private Double s48; + + @TableField(value = "s_49",updateStrategy = FieldStrategy.IGNORED) + private Double s49; + + @TableField(value = "s_50",updateStrategy = FieldStrategy.IGNORED) + private Double s50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateID.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateID.java new file mode 100644 index 0000000..8b4313a --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateID.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMRATE_I_D") +public class RStatDataHarmRateID implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED) + private Double i1; + + @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED) + private Double i2; + + @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED) + private Double i3; + + @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED) + private Double i4; + + @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED) + private Double i5; + + @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED) + private Double i6; + + @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED) + private Double i7; + + @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED) + private Double i8; + + @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED) + private Double i9; + + @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED) + private Double i10; + + @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED) + private Double i11; + + @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED) + private Double i12; + + @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED) + private Double i13; + + @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED) + private Double i14; + + @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED) + private Double i15; + + @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED) + private Double i16; + + @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED) + private Double i17; + + @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED) + private Double i18; + + @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED) + private Double i19; + + @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED) + private Double i20; + + @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED) + private Double i21; + + @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED) + private Double i22; + + @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED) + private Double i23; + + @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED) + private Double i24; + + @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED) + private Double i25; + + @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED) + private Double i26; + + @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED) + private Double i27; + + @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED) + private Double i28; + + @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED) + private Double i29; + + @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED) + private Double i30; + + @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED) + private Double i31; + + @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED) + private Double i32; + + @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED) + private Double i33; + + @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED) + private Double i34; + + @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED) + private Double i35; + + @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED) + private Double i36; + + @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED) + private Double i37; + + @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED) + private Double i38; + + @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED) + private Double i39; + + @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED) + private Double i40; + + @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED) + private Double i41; + + @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED) + private Double i42; + + @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED) + private Double i43; + + @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED) + private Double i44; + + @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED) + private Double i45; + + @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED) + private Double i46; + + @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED) + private Double i47; + + @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED) + private Double i48; + + @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED) + private Double i49; + + @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED) + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateVD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateVD.java new file mode 100644 index 0000000..323240e --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataHarmRateVD.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_HARMRATE_V_D") +public class RStatDataHarmRateVD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED) + private Double v1; + + @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED) + private Double v2; + + @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED) + private Double v3; + + @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED) + private Double v4; + + @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED) + private Double v5; + + @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED) + private Double v6; + + @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED) + private Double v7; + + @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED) + private Double v8; + + @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED) + private Double v9; + + @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED) + private Double v10; + + @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED) + private Double v11; + + @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED) + private Double v12; + + @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED) + private Double v13; + + @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED) + private Double v14; + + @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED) + private Double v15; + + @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED) + private Double v16; + + @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED) + private Double v17; + + @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED) + private Double v18; + + @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED) + private Double v19; + + @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED) + private Double v20; + + @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED) + private Double v21; + + @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED) + private Double v22; + + @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED) + private Double v23; + + @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED) + private Double v24; + + @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED) + private Double v25; + + @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED) + private Double v26; + + @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED) + private Double v27; + + @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED) + private Double v28; + + @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED) + private Double v29; + + @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED) + private Double v30; + + @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED) + private Double v31; + + @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED) + private Double v32; + + @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED) + private Double v33; + + @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED) + private Double v34; + + @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED) + private Double v35; + + @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED) + private Double v36; + + @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED) + private Double v37; + + @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED) + private Double v38; + + @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED) + private Double v39; + + @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED) + private Double v40; + + @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED) + private Double v41; + + @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED) + private Double v42; + + @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED) + private Double v43; + + @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED) + private Double v44; + + @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED) + private Double v45; + + @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED) + private Double v46; + + @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED) + private Double v47; + + @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED) + private Double v48; + + @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED) + private Double v49; + + @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED) + private Double v50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataID.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataID.java new file mode 100644 index 0000000..efa45c4 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataID.java @@ -0,0 +1,209 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "r_stat_data_i_d") +public class RStatDataID implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_neg",updateStrategy = FieldStrategy.IGNORED) + private Double iNeg; + + @TableField(value = "i_pos",updateStrategy = FieldStrategy.IGNORED) + private Double iPos; + + @TableField(value = "i_thd",updateStrategy = FieldStrategy.IGNORED) + private Double iThd; + + @TableField(value = "i_unbalance",updateStrategy = FieldStrategy.IGNORED) + private Double iUnbalance; + + @TableField(value = "i_zero",updateStrategy = FieldStrategy.IGNORED) + private Double iZero; + + @TableField(value = "rms",updateStrategy = FieldStrategy.IGNORED) + private Double rms; + + @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED) + private Double i1; + + @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED) + private Double i2; + + @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED) + private Double i3; + + @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED) + private Double i4; + + @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED) + private Double i5; + + @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED) + private Double i6; + + @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED) + private Double i7; + + @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED) + private Double i8; + + @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED) + private Double i9; + + @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED) + private Double i10; + + @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED) + private Double i11; + + @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED) + private Double i12; + + @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED) + private Double i13; + + @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED) + private Double i14; + + @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED) + private Double i15; + + @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED) + private Double i16; + + @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED) + private Double i17; + + @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED) + private Double i18; + + @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED) + private Double i19; + + @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED) + private Double i20; + + @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED) + private Double i21; + + @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED) + private Double i22; + + @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED) + private Double i23; + + @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED) + private Double i24; + + @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED) + private Double i25; + + @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED) + private Double i26; + + @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED) + private Double i27; + + @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED) + private Double i28; + + @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED) + private Double i29; + + @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED) + private Double i30; + + @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED) + private Double i31; + + @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED) + private Double i32; + + @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED) + private Double i33; + + @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED) + private Double i34; + + @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED) + private Double i35; + + @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED) + private Double i36; + + @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED) + private Double i37; + + @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED) + private Double i38; + + @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED) + private Double i39; + + @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED) + private Double i40; + + @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED) + private Double i41; + + @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED) + private Double i42; + + @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED) + private Double i43; + + @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED) + private Double i44; + + @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED) + private Double i45; + + @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED) + private Double i46; + + @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED) + private Double i47; + + @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED) + private Double i48; + + @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED) + private Double i49; + + @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED) + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmID.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmID.java new file mode 100644 index 0000000..0becc49 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmID.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_INHARM_I_D") +public class RStatDataInHarmID implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "i_1",updateStrategy = FieldStrategy.IGNORED) + private Double i1; + + @TableField(value = "i_2",updateStrategy = FieldStrategy.IGNORED) + private Double i2; + + @TableField(value = "i_3",updateStrategy = FieldStrategy.IGNORED) + private Double i3; + + @TableField(value = "i_4",updateStrategy = FieldStrategy.IGNORED) + private Double i4; + + @TableField(value = "i_5",updateStrategy = FieldStrategy.IGNORED) + private Double i5; + + @TableField(value = "i_6",updateStrategy = FieldStrategy.IGNORED) + private Double i6; + + @TableField(value = "i_7",updateStrategy = FieldStrategy.IGNORED) + private Double i7; + + @TableField(value = "i_8",updateStrategy = FieldStrategy.IGNORED) + private Double i8; + + @TableField(value = "i_9",updateStrategy = FieldStrategy.IGNORED) + private Double i9; + + @TableField(value = "i_10",updateStrategy = FieldStrategy.IGNORED) + private Double i10; + + @TableField(value = "i_11",updateStrategy = FieldStrategy.IGNORED) + private Double i11; + + @TableField(value = "i_12",updateStrategy = FieldStrategy.IGNORED) + private Double i12; + + @TableField(value = "i_13",updateStrategy = FieldStrategy.IGNORED) + private Double i13; + + @TableField(value = "i_14",updateStrategy = FieldStrategy.IGNORED) + private Double i14; + + @TableField(value = "i_15",updateStrategy = FieldStrategy.IGNORED) + private Double i15; + + @TableField(value = "i_16",updateStrategy = FieldStrategy.IGNORED) + private Double i16; + + @TableField(value = "i_17",updateStrategy = FieldStrategy.IGNORED) + private Double i17; + + @TableField(value = "i_18",updateStrategy = FieldStrategy.IGNORED) + private Double i18; + + @TableField(value = "i_19",updateStrategy = FieldStrategy.IGNORED) + private Double i19; + + @TableField(value = "i_20",updateStrategy = FieldStrategy.IGNORED) + private Double i20; + + @TableField(value = "i_21",updateStrategy = FieldStrategy.IGNORED) + private Double i21; + + @TableField(value = "i_22",updateStrategy = FieldStrategy.IGNORED) + private Double i22; + + @TableField(value = "i_23",updateStrategy = FieldStrategy.IGNORED) + private Double i23; + + @TableField(value = "i_24",updateStrategy = FieldStrategy.IGNORED) + private Double i24; + + @TableField(value = "i_25",updateStrategy = FieldStrategy.IGNORED) + private Double i25; + + @TableField(value = "i_26",updateStrategy = FieldStrategy.IGNORED) + private Double i26; + + @TableField(value = "i_27",updateStrategy = FieldStrategy.IGNORED) + private Double i27; + + @TableField(value = "i_28",updateStrategy = FieldStrategy.IGNORED) + private Double i28; + + @TableField(value = "i_29",updateStrategy = FieldStrategy.IGNORED) + private Double i29; + + @TableField(value = "i_30",updateStrategy = FieldStrategy.IGNORED) + private Double i30; + + @TableField(value = "i_31",updateStrategy = FieldStrategy.IGNORED) + private Double i31; + + @TableField(value = "i_32",updateStrategy = FieldStrategy.IGNORED) + private Double i32; + + @TableField(value = "i_33",updateStrategy = FieldStrategy.IGNORED) + private Double i33; + + @TableField(value = "i_34",updateStrategy = FieldStrategy.IGNORED) + private Double i34; + + @TableField(value = "i_35",updateStrategy = FieldStrategy.IGNORED) + private Double i35; + + @TableField(value = "i_36",updateStrategy = FieldStrategy.IGNORED) + private Double i36; + + @TableField(value = "i_37",updateStrategy = FieldStrategy.IGNORED) + private Double i37; + + @TableField(value = "i_38",updateStrategy = FieldStrategy.IGNORED) + private Double i38; + + @TableField(value = "i_39",updateStrategy = FieldStrategy.IGNORED) + private Double i39; + + @TableField(value = "i_40",updateStrategy = FieldStrategy.IGNORED) + private Double i40; + + @TableField(value = "i_41",updateStrategy = FieldStrategy.IGNORED) + private Double i41; + + @TableField(value = "i_42",updateStrategy = FieldStrategy.IGNORED) + private Double i42; + + @TableField(value = "i_43",updateStrategy = FieldStrategy.IGNORED) + private Double i43; + + @TableField(value = "i_44",updateStrategy = FieldStrategy.IGNORED) + private Double i44; + + @TableField(value = "i_45",updateStrategy = FieldStrategy.IGNORED) + private Double i45; + + @TableField(value = "i_46",updateStrategy = FieldStrategy.IGNORED) + private Double i46; + + @TableField(value = "i_47",updateStrategy = FieldStrategy.IGNORED) + private Double i47; + + @TableField(value = "i_48",updateStrategy = FieldStrategy.IGNORED) + private Double i48; + + @TableField(value = "i_49",updateStrategy = FieldStrategy.IGNORED) + private Double i49; + + @TableField(value = "i_50",updateStrategy = FieldStrategy.IGNORED) + private Double i50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmVD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmVD.java new file mode 100644 index 0000000..2a577a9 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataInHarmVD.java @@ -0,0 +1,191 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_INHARM_V_D") +public class RStatDataInHarmVD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "v_1",updateStrategy = FieldStrategy.IGNORED) + private Double v1; + + @TableField(value = "v_2",updateStrategy = FieldStrategy.IGNORED) + private Double v2; + + @TableField(value = "v_3",updateStrategy = FieldStrategy.IGNORED) + private Double v3; + + @TableField(value = "v_4",updateStrategy = FieldStrategy.IGNORED) + private Double v4; + + @TableField(value = "v_5",updateStrategy = FieldStrategy.IGNORED) + private Double v5; + + @TableField(value = "v_6",updateStrategy = FieldStrategy.IGNORED) + private Double v6; + + @TableField(value = "v_7",updateStrategy = FieldStrategy.IGNORED) + private Double v7; + + @TableField(value = "v_8",updateStrategy = FieldStrategy.IGNORED) + private Double v8; + + @TableField(value = "v_9",updateStrategy = FieldStrategy.IGNORED) + private Double v9; + + @TableField(value = "v_10",updateStrategy = FieldStrategy.IGNORED) + private Double v10; + + @TableField(value = "v_11",updateStrategy = FieldStrategy.IGNORED) + private Double v11; + + @TableField(value = "v_12",updateStrategy = FieldStrategy.IGNORED) + private Double v12; + + @TableField(value = "v_13",updateStrategy = FieldStrategy.IGNORED) + private Double v13; + + @TableField(value = "v_14",updateStrategy = FieldStrategy.IGNORED) + private Double v14; + + @TableField(value = "v_15",updateStrategy = FieldStrategy.IGNORED) + private Double v15; + + @TableField(value = "v_16",updateStrategy = FieldStrategy.IGNORED) + private Double v16; + + @TableField(value = "v_17",updateStrategy = FieldStrategy.IGNORED) + private Double v17; + + @TableField(value = "v_18",updateStrategy = FieldStrategy.IGNORED) + private Double v18; + + @TableField(value = "v_19",updateStrategy = FieldStrategy.IGNORED) + private Double v19; + + @TableField(value = "v_20",updateStrategy = FieldStrategy.IGNORED) + private Double v20; + + @TableField(value = "v_21",updateStrategy = FieldStrategy.IGNORED) + private Double v21; + + @TableField(value = "v_22",updateStrategy = FieldStrategy.IGNORED) + private Double v22; + + @TableField(value = "v_23",updateStrategy = FieldStrategy.IGNORED) + private Double v23; + + @TableField(value = "v_24",updateStrategy = FieldStrategy.IGNORED) + private Double v24; + + @TableField(value = "v_25",updateStrategy = FieldStrategy.IGNORED) + private Double v25; + + @TableField(value = "v_26",updateStrategy = FieldStrategy.IGNORED) + private Double v26; + + @TableField(value = "v_27",updateStrategy = FieldStrategy.IGNORED) + private Double v27; + + @TableField(value = "v_28",updateStrategy = FieldStrategy.IGNORED) + private Double v28; + + @TableField(value = "v_29",updateStrategy = FieldStrategy.IGNORED) + private Double v29; + + @TableField(value = "v_30",updateStrategy = FieldStrategy.IGNORED) + private Double v30; + + @TableField(value = "v_31",updateStrategy = FieldStrategy.IGNORED) + private Double v31; + + @TableField(value = "v_32",updateStrategy = FieldStrategy.IGNORED) + private Double v32; + + @TableField(value = "v_33",updateStrategy = FieldStrategy.IGNORED) + private Double v33; + + @TableField(value = "v_34",updateStrategy = FieldStrategy.IGNORED) + private Double v34; + + @TableField(value = "v_35",updateStrategy = FieldStrategy.IGNORED) + private Double v35; + + @TableField(value = "v_36",updateStrategy = FieldStrategy.IGNORED) + private Double v36; + + @TableField(value = "v_37",updateStrategy = FieldStrategy.IGNORED) + private Double v37; + + @TableField(value = "v_38",updateStrategy = FieldStrategy.IGNORED) + private Double v38; + + @TableField(value = "v_39",updateStrategy = FieldStrategy.IGNORED) + private Double v39; + + @TableField(value = "v_40",updateStrategy = FieldStrategy.IGNORED) + private Double v40; + + @TableField(value = "v_41",updateStrategy = FieldStrategy.IGNORED) + private Double v41; + + @TableField(value = "v_42",updateStrategy = FieldStrategy.IGNORED) + private Double v42; + + @TableField(value = "v_43",updateStrategy = FieldStrategy.IGNORED) + private Double v43; + + @TableField(value = "v_44",updateStrategy = FieldStrategy.IGNORED) + private Double v44; + + @TableField(value = "v_45",updateStrategy = FieldStrategy.IGNORED) + private Double v45; + + @TableField(value = "v_46",updateStrategy = FieldStrategy.IGNORED) + private Double v46; + + @TableField(value = "v_47",updateStrategy = FieldStrategy.IGNORED) + private Double v47; + + @TableField(value = "v_48",updateStrategy = FieldStrategy.IGNORED) + private Double v48; + + @TableField(value = "v_49",updateStrategy = FieldStrategy.IGNORED) + private Double v49; + + @TableField(value = "v_50",updateStrategy = FieldStrategy.IGNORED) + private Double v50; + +} diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataPltD.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataPltD.java new file mode 100644 index 0000000..4237a48 --- /dev/null +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/RStatDataPltD.java @@ -0,0 +1,44 @@ +package com.njcn.dataProcess.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 类的介绍： + * + * @author xy + * @version 1.0.0 + */ +@Data +@TableName(value = "R_STAT_DATA_PLT_D") +public class RStatDataPltD implements Serializable { + + @MppMultiId + @TableField(value = "time") + private LocalDate time; + + @MppMultiId + @TableField(value = "line_id") + private String lineId; + + @MppMultiId + @TableField(value = "phasic_type") + private String phasicType; + + @MppMultiId + @TableField(value = "value_type") + private String valueType; + + @TableField(value = "quality_flag") + private Integer qualityFlag; + + @TableField(value = "plt",updateStrategy = FieldStrategy.IGNORED) + private Double plt; + +} 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 75dc3f1..8f179c8 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 @@ -10,7 +10,9 @@ import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; 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; @@ -64,7 +66,22 @@ public class DataFlickerController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataFlickerQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } - + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List dataFlickerDtoList) { + String methodDescribe = getMethodDescribe("addList"); + dataFlickerInsert.addList(dataFlickerDtoList); + 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 7717407..45b49f3 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 @@ -10,8 +10,8 @@ import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; 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.DataPltDto; import com.njcn.dataProcess.service.IDataFluc; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -64,4 +64,22 @@ public class DataFlucController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataFlucQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List dataFlucDtoList) { + String methodDescribe = getMethodDescribe("addList"); + dataFlucInsert.addList(dataFlucDtoList); + 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 6a7ba94..a6c1c05 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 @@ -6,9 +6,12 @@ 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.DataHarmphasicIDTO; import com.njcn.dataProcess.annotation.InsertBean; 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.DataHarmPhasicIDto; import com.njcn.dataProcess.service.IDataHarmphasicI; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -53,7 +56,23 @@ public class DataHarmphasicIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataHarmphasicIQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addList"); + dataHarmphasicIInsert.addList(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 3525b59..fff0d3e 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 @@ -10,7 +10,10 @@ import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; 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; import io.swagger.annotations.Api; @@ -55,7 +58,6 @@ public class DataHarmphasicVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) @PostMapping("/getRawData") @ApiOperation("获取原始数据") @@ -65,6 +67,22 @@ public class DataHarmphasicVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataHarmphasicVQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addList"); + dataHarmphasicVInsert.addList(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 e12e90e..523b1a3 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 @@ -10,6 +10,9 @@ import com.njcn.dataProcess.annotation.InsertBean; 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; import com.njcn.web.controller.BaseController; @@ -64,4 +67,22 @@ public class DataHarmpowerPController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataHarmpowerPQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addList"); + dataHarmpowerPInsert.addList(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 ee09892..60150c5 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 @@ -9,6 +9,10 @@ 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.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; import io.swagger.annotations.Api; @@ -53,7 +57,23 @@ public class DataHarmpowerQController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataHarmpowerQQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List list) { + String methodDescribe = getMethodDescribe("addList"); + dataHarmpowerQInsert.addList(list); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } 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 8e8929c..277160e 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 @@ -10,6 +10,7 @@ import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; 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.service.IDataI; import com.njcn.web.controller.BaseController; @@ -64,4 +65,22 @@ public class DataIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY) + @PostMapping("/getBaseData") + @ApiOperation("获取算法基础数据") + public HttpResult> getBaseData(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getBaseData"); + List data = dataIQuery.getBaseData(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addList") + @ApiOperation("关系型数据库插入数据") + public HttpResult addList(@RequestBody List dataIDtoList) { + String methodDescribe = getMethodDescribe("addList"); + dataIInsert.addList(dataIDtoList); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); + } + } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlickerRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlickerRelationMapper.java new file mode 100644 index 0000000..c5ec44e --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlickerRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataFlickerD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataFlickerRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlucRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlucRelationMapper.java new file mode 100644 index 0000000..546b8ba --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataFlucRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataFlucD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataFlucRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicIRelationMapper.java new file mode 100644 index 0000000..af7e002 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicIRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmPhasicIRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicVRelationMapper.java new file mode 100644 index 0000000..fffe656 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPhasicVRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicVD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmPhasicVRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerPRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerPRelationMapper.java new file mode 100644 index 0000000..a22bd2b --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerPRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerPD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmPowerPRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerQRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerQRelationMapper.java new file mode 100644 index 0000000..608aae3 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerQRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmPowerQRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerSRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerSRelationMapper.java new file mode 100644 index 0000000..2c73628 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmPowerSRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerSD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmPowerSRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateIRelationMapper.java new file mode 100644 index 0000000..950f7ba --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateIRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmRateID; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmRateIRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateVRelationMapper.java new file mode 100644 index 0000000..c00d940 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataHarmRateVRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataHarmRateVD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataHarmRateVRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataIRelationMapper.java new file mode 100644 index 0000000..1cbf01f --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataIRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataID; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataIRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmIRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmIRelationMapper.java new file mode 100644 index 0000000..14f404a --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmIRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataInHarmID; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataInHarmIRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmVRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmVRelationMapper.java new file mode 100644 index 0000000..8daafe4 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataInHarmVRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataInHarmVD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataInHarmVRelationMapper extends MppBaseMapper { + + + +} diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataPltRelationMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataPltRelationMapper.java new file mode 100644 index 0000000..2b72463 --- /dev/null +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatDataPltRelationMapper.java @@ -0,0 +1,16 @@ +package com.njcn.dataProcess.dao.relation.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.dataProcess.pojo.po.RStatDataPltD; + + +/** + *

+ * Mapper 接口 + *

+ */ +public interface RStatDataPltRelationMapper extends MppBaseMapper { + + + +} 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 c40d23a..798bbc6 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 @@ -1,8 +1,11 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; 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.po.RStatDataFlickerD; import java.util.List; @@ -13,7 +16,7 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataFlicker { +public interface IDataFlicker extends IMppService { void batchInsertion(List dataIDTOList); /** @@ -22,4 +25,15 @@ public interface IDataFlicker { * @return */ List getRawData(LineCountEvaluateParam lineParam); + + /** + * 获取监测点原始数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(List dataIDtoList); } 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 01b0ca9..0d0021e 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 @@ -1,8 +1,11 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; 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.po.RStatDataFlucD; import java.util.List; @@ -13,7 +16,7 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataFluc { +public interface IDataFluc extends IMppService { void batchInsertion(List dataIDTOList); /** @@ -22,4 +25,15 @@ public interface IDataFluc { * @return */ List getRawData(LineCountEvaluateParam lineParam); + + /** + * 获取监测点原始数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(List dataFlucDtoList); } 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 0837b0f..508698e 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 @@ -1,6 +1,11 @@ package com.njcn.dataProcess.service; +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.DataHarmPhasicIDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import java.util.List; @@ -11,6 +16,17 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataHarmphasicI { +public interface IDataHarmphasicI extends IMppService { void batchInsertion(List dataIDTOList); + + /** + * 获取监测点原始数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(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 e5e1eff..6409197 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 @@ -1,8 +1,12 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; 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 com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicVD; import java.util.List; @@ -13,7 +17,7 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataHarmphasicV { +public interface IDataHarmphasicV extends IMppService { void batchInsertion(List dataIDTOList); /** @@ -22,4 +26,15 @@ public interface IDataHarmphasicV { * @return */ List getRawData(LineCountEvaluateParam lineParam); + + /** + * 获取预处理数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(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 71d9533..60b2489 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 @@ -1,9 +1,12 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.dto.DataHarmpowerPDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerPD; import java.util.List; @@ -14,7 +17,7 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataHarmpowerP { +public interface IDataHarmpowerP extends IMppService { void batchInsertion(List dataIDTOList); /** @@ -23,4 +26,15 @@ public interface IDataHarmpowerP { * @return */ List getRawData(LineCountEvaluateParam lineParam); + + /** + * 获取预处理数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(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 218357a..5b3b115 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 @@ -1,6 +1,11 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; 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 com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD; import java.util.List; @@ -11,6 +16,17 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataHarmpowerQ { +public interface IDataHarmpowerQ extends IMppService { void batchInsertion(List dataIDTOList); + + /** + * 获取预处理数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(List list); } 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 64437bd..2f36331 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 @@ -1,10 +1,12 @@ package com.njcn.dataProcess.service; +import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.po.influx.DataI; +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; import java.util.List; @@ -15,7 +17,7 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface IDataI { +public interface IDataI extends IMppService { void batchInsertion(List dataIDTOList); @@ -25,4 +27,15 @@ public interface IDataI { * @return */ List getRawData(LineCountEvaluateParam lineParam); + + /** + * 获取监测点原始数据 + * @param lineParam 监测点参数 + */ + List getBaseData(LineCountEvaluateParam lineParam); + + /** + * 批量插入数据 + */ + void addList(List dataIDtoList); } 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 4af8eea..e426b3d 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 @@ -1,12 +1,17 @@ package com.njcn.dataProcess.service.impl.influxdb; import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.imapper.DataFlickerMapper; +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.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlickerDto; +import com.njcn.dataProcess.pojo.po.RStatDataFlickerD; import com.njcn.dataProcess.service.IDataFlicker; +import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; @@ -16,6 +21,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.stream.Collectors; @@ -29,7 +35,7 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataFlickerImpl") @RequiredArgsConstructor -public class InfluxdbDataFlickerImpl implements IDataFlicker { +public class InfluxdbDataFlickerImpl extends MppServiceImpl implements IDataFlicker { private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -68,6 +74,54 @@ public class InfluxdbDataFlickerImpl implements IDataFlicker { return result; } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(dataIList)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = dataIList.stream().collect(Collectors.groupingBy(DataFlicker::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataFlicker::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + + List valueTypes = new ArrayList<>(); + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(null); + + //规定好集合指标参数 + List data1 = phasicTypeList.stream().map(DataFlicker::getFluc).collect(Collectors.toList()); + List data2 = phasicTypeList.stream().map(DataFlicker::getPlt).collect(Collectors.toList()); + List data3 = phasicTypeList.stream().map(DataFlicker::getPst).collect(Collectors.toList()); + + List> lists = Arrays.asList(data1,data2,data3); + value.setValueList(lists); + valueTypes.add(value); + + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List dataIDtoList) { + + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 d06f867..fb4aa0e 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 @@ -1,12 +1,17 @@ package com.njcn.dataProcess.service.impl.influxdb; import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.imapper.DataFlucMapper; +import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlucRelationMapper; import com.njcn.dataProcess.dto.DataFlucDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataFluc; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlucDto; +import com.njcn.dataProcess.pojo.po.RStatDataFlucD; import com.njcn.dataProcess.service.IDataFluc; +import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; @@ -16,6 +21,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.stream.Collectors; @@ -29,7 +35,7 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataFlucImpl") @RequiredArgsConstructor -public class InfluxdbDataFlucImpl implements IDataFluc { +public class InfluxdbDataFlucImpl extends MppServiceImpl implements IDataFluc { private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -68,6 +74,53 @@ public class InfluxdbDataFlucImpl implements IDataFluc { return result; } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(dataIList)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = dataIList.stream().collect(Collectors.groupingBy(DataFluc::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataFluc::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + + List valueTypes = new ArrayList<>(); + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(null); + + //规定好集合指标参数 + List data1 = phasicTypeList.stream().map(DataFluc::getFluc).collect(Collectors.toList()); + List data2 = phasicTypeList.stream().map(DataFluc::getFluccf).collect(Collectors.toList()); + + List> lists = Arrays.asList(data1,data2); + value.setValueList(lists); + valueTypes.add(value); + + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List dataFlucDtoList) { + + } + /** * 按监测点集合、时间条件获取分钟数据 * 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 2f07734..7b36c65 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,15 +1,30 @@ package com.njcn.dataProcess.service.impl.influxdb; -import com.njcn.dataProcess.dto.DataHarmphasicIDTO; +import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.dataProcess.dao.imapper.DataHarmphasicIMapper; +import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicIRelationMapper; +import com.njcn.dataProcess.dto.DataHarmphasicIDTO; +import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmphasicI; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPhasicIDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import com.njcn.dataProcess.service.IDataHarmphasicI; +import com.njcn.dataProcess.util.TimeUtils; +import com.njcn.influx.constant.InfluxDbSqlConstant; +import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; 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.stream.Collectors; /** @@ -21,11 +36,11 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataHarmphasicIImpl") @RequiredArgsConstructor -public class InfluxdbDataHarmphasicIImpl implements IDataHarmphasicI { +public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl implements IDataHarmphasicI { + private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); private final DataHarmphasicIMapper dataHarmphasicIMapper; - @Override public void batchInsertion(List dataHarmphasicIDTOList) { int totalCount = dataHarmphasicIDTOList.size(); @@ -44,4 +59,156 @@ public class InfluxdbDataHarmphasicIImpl implements IDataHarmphasicI { } } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(data)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = data.stream().collect(Collectors.groupingBy(DataHarmphasicI::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataHarmphasicI::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + //以数据类型分组 + Map> valueTypeMap = phasicTypeList.stream().collect(Collectors.groupingBy(DataHarmphasicI::getValueType)); + List valueTypes = new ArrayList<>(); + valueTypeMap.forEach((valueType,valueTypeList)->{ + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(valueType); + //规定好集合指标参数 + List data12 = valueTypeList.stream().map(DataHarmphasicI::getI1).collect(Collectors.toList()); + List data13 = valueTypeList.stream().map(DataHarmphasicI::getI2).collect(Collectors.toList()); + List data14 = valueTypeList.stream().map(DataHarmphasicI::getI3).collect(Collectors.toList()); + List data15 = valueTypeList.stream().map(DataHarmphasicI::getI4).collect(Collectors.toList()); + List data16 = valueTypeList.stream().map(DataHarmphasicI::getI5).collect(Collectors.toList()); + List data17 = valueTypeList.stream().map(DataHarmphasicI::getI6).collect(Collectors.toList()); + List data18 = valueTypeList.stream().map(DataHarmphasicI::getI7).collect(Collectors.toList()); + List data19 = valueTypeList.stream().map(DataHarmphasicI::getI8).collect(Collectors.toList()); + List data20 = valueTypeList.stream().map(DataHarmphasicI::getI9).collect(Collectors.toList()); + List data21 = valueTypeList.stream().map(DataHarmphasicI::getI10).collect(Collectors.toList()); + List data22 = valueTypeList.stream().map(DataHarmphasicI::getI11).collect(Collectors.toList()); + List data23 = valueTypeList.stream().map(DataHarmphasicI::getI12).collect(Collectors.toList()); + List data24 = valueTypeList.stream().map(DataHarmphasicI::getI13).collect(Collectors.toList()); + List data25 = valueTypeList.stream().map(DataHarmphasicI::getI14).collect(Collectors.toList()); + List data26 = valueTypeList.stream().map(DataHarmphasicI::getI15).collect(Collectors.toList()); + List data27 = valueTypeList.stream().map(DataHarmphasicI::getI16).collect(Collectors.toList()); + List data28 = valueTypeList.stream().map(DataHarmphasicI::getI17).collect(Collectors.toList()); + List data29 = valueTypeList.stream().map(DataHarmphasicI::getI18).collect(Collectors.toList()); + List data30 = valueTypeList.stream().map(DataHarmphasicI::getI19).collect(Collectors.toList()); + List data31 = valueTypeList.stream().map(DataHarmphasicI::getI20).collect(Collectors.toList()); + List data32 = valueTypeList.stream().map(DataHarmphasicI::getI21).collect(Collectors.toList()); + List data33 = valueTypeList.stream().map(DataHarmphasicI::getI22).collect(Collectors.toList()); + List data34 = valueTypeList.stream().map(DataHarmphasicI::getI23).collect(Collectors.toList()); + List data35 = valueTypeList.stream().map(DataHarmphasicI::getI24).collect(Collectors.toList()); + List data36 = valueTypeList.stream().map(DataHarmphasicI::getI25).collect(Collectors.toList()); + List data37 = valueTypeList.stream().map(DataHarmphasicI::getI26).collect(Collectors.toList()); + List data38 = valueTypeList.stream().map(DataHarmphasicI::getI27).collect(Collectors.toList()); + List data39 = valueTypeList.stream().map(DataHarmphasicI::getI28).collect(Collectors.toList()); + List data40 = valueTypeList.stream().map(DataHarmphasicI::getI29).collect(Collectors.toList()); + List data41 = valueTypeList.stream().map(DataHarmphasicI::getI30).collect(Collectors.toList()); + List data42 = valueTypeList.stream().map(DataHarmphasicI::getI31).collect(Collectors.toList()); + List data43 = valueTypeList.stream().map(DataHarmphasicI::getI32).collect(Collectors.toList()); + List data44 = valueTypeList.stream().map(DataHarmphasicI::getI33).collect(Collectors.toList()); + List data45 = valueTypeList.stream().map(DataHarmphasicI::getI34).collect(Collectors.toList()); + List data46 = valueTypeList.stream().map(DataHarmphasicI::getI35).collect(Collectors.toList()); + List data47 = valueTypeList.stream().map(DataHarmphasicI::getI36).collect(Collectors.toList()); + List data48 = valueTypeList.stream().map(DataHarmphasicI::getI37).collect(Collectors.toList()); + List data49 = valueTypeList.stream().map(DataHarmphasicI::getI38).collect(Collectors.toList()); + List data50 = valueTypeList.stream().map(DataHarmphasicI::getI39).collect(Collectors.toList()); + List data51 = valueTypeList.stream().map(DataHarmphasicI::getI40).collect(Collectors.toList()); + List data52 = valueTypeList.stream().map(DataHarmphasicI::getI41).collect(Collectors.toList()); + List data53 = valueTypeList.stream().map(DataHarmphasicI::getI42).collect(Collectors.toList()); + List data54 = valueTypeList.stream().map(DataHarmphasicI::getI43).collect(Collectors.toList()); + List data55 = valueTypeList.stream().map(DataHarmphasicI::getI44).collect(Collectors.toList()); + List data56 = valueTypeList.stream().map(DataHarmphasicI::getI45).collect(Collectors.toList()); + List data57 = valueTypeList.stream().map(DataHarmphasicI::getI46).collect(Collectors.toList()); + List data58 = valueTypeList.stream().map(DataHarmphasicI::getI47).collect(Collectors.toList()); + List data59 = valueTypeList.stream().map(DataHarmphasicI::getI48).collect(Collectors.toList()); + List data60 = valueTypeList.stream().map(DataHarmphasicI::getI49).collect(Collectors.toList()); + List data61 = valueTypeList.stream().map(DataHarmphasicI::getI50).collect(Collectors.toList()); + + List> lists = Arrays.asList(data12,data13,data14,data15,data16 + ,data17,data18,data19,data20,data21,data22,data23,data24,data25,data26 + ,data27,data28,data29,data30,data31,data32,data33,data34,data35,data36 + ,data37,data38,data39,data40,data41,data42,data43,data44,data45,data46 + ,data47,data48,data49,data50,data51,data52,data53,data54,data55,data56 + ,data57,data58,data59,data60,data61); + value.setValueList(lists); + valueTypes.add(value); + }); + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List list) { + + } + + /** + * 按监测点集合、时间条件获取分钟数据 + * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 + * 需要进行剔除异常数据时,这里会有三种情况判断 + * 1.无异常数据，则直接返回集合； + * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据； + * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常 + */ + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + List result = new ArrayList<>(); + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.regular(DataHarmphasicI::getLineId, lineList) + .select(DataHarmphasicI::getLineId) + .select(DataHarmphasicI::getPhasicType) + .select(DataHarmphasicI::getValueType) + .select(DataHarmphasicI::getQualityFlag) + .between(DataHarmphasicI::getTime, startTime, endTime) + .eq(DataHarmphasicI::getQualityFlag,"0"); + List 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); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } + } + //没有异常数据，则使用原数据 + else { + result.addAll(v); + } + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(list); + } + 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 3c1f37c..ee80f92 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,13 +1,20 @@ package com.njcn.dataProcess.service.impl.influxdb; import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; 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.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicVD; import com.njcn.dataProcess.service.IDataHarmphasicV; +import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; @@ -17,9 +24,7 @@ import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -31,7 +36,7 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataHarmphasicVImpl") @RequiredArgsConstructor -public class InfluxdbDataHarmphasicVImpl implements IDataHarmphasicV { +public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl implements IDataHarmphasicV { private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -70,6 +75,107 @@ public class InfluxdbDataHarmphasicVImpl implements IDataHarmphasicV { return result; } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(data)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = data.stream().collect(Collectors.groupingBy(DataHarmphasicV::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataHarmphasicV::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + //以数据类型分组 + Map> valueTypeMap = phasicTypeList.stream().collect(Collectors.groupingBy(DataHarmphasicV::getValueType)); + List valueTypes = new ArrayList<>(); + valueTypeMap.forEach((valueType,valueTypeList)->{ + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(valueType); + //规定好集合指标参数 + List data12 = valueTypeList.stream().map(DataHarmphasicV::getV1).collect(Collectors.toList()); + List data13 = valueTypeList.stream().map(DataHarmphasicV::getV2).collect(Collectors.toList()); + List data14 = valueTypeList.stream().map(DataHarmphasicV::getV3).collect(Collectors.toList()); + List data15 = valueTypeList.stream().map(DataHarmphasicV::getV4).collect(Collectors.toList()); + List data16 = valueTypeList.stream().map(DataHarmphasicV::getV5).collect(Collectors.toList()); + List data17 = valueTypeList.stream().map(DataHarmphasicV::getV6).collect(Collectors.toList()); + List data18 = valueTypeList.stream().map(DataHarmphasicV::getV7).collect(Collectors.toList()); + List data19 = valueTypeList.stream().map(DataHarmphasicV::getV8).collect(Collectors.toList()); + List data20 = valueTypeList.stream().map(DataHarmphasicV::getV9).collect(Collectors.toList()); + List data21 = valueTypeList.stream().map(DataHarmphasicV::getV10).collect(Collectors.toList()); + List data22 = valueTypeList.stream().map(DataHarmphasicV::getV11).collect(Collectors.toList()); + List data23 = valueTypeList.stream().map(DataHarmphasicV::getV12).collect(Collectors.toList()); + List data24 = valueTypeList.stream().map(DataHarmphasicV::getV13).collect(Collectors.toList()); + List data25 = valueTypeList.stream().map(DataHarmphasicV::getV14).collect(Collectors.toList()); + List data26 = valueTypeList.stream().map(DataHarmphasicV::getV15).collect(Collectors.toList()); + List data27 = valueTypeList.stream().map(DataHarmphasicV::getV16).collect(Collectors.toList()); + List data28 = valueTypeList.stream().map(DataHarmphasicV::getV17).collect(Collectors.toList()); + List data29 = valueTypeList.stream().map(DataHarmphasicV::getV18).collect(Collectors.toList()); + List data30 = valueTypeList.stream().map(DataHarmphasicV::getV19).collect(Collectors.toList()); + List data31 = valueTypeList.stream().map(DataHarmphasicV::getV20).collect(Collectors.toList()); + List data32 = valueTypeList.stream().map(DataHarmphasicV::getV21).collect(Collectors.toList()); + List data33 = valueTypeList.stream().map(DataHarmphasicV::getV22).collect(Collectors.toList()); + List data34 = valueTypeList.stream().map(DataHarmphasicV::getV23).collect(Collectors.toList()); + List data35 = valueTypeList.stream().map(DataHarmphasicV::getV24).collect(Collectors.toList()); + List data36 = valueTypeList.stream().map(DataHarmphasicV::getV25).collect(Collectors.toList()); + List data37 = valueTypeList.stream().map(DataHarmphasicV::getV26).collect(Collectors.toList()); + List data38 = valueTypeList.stream().map(DataHarmphasicV::getV27).collect(Collectors.toList()); + List data39 = valueTypeList.stream().map(DataHarmphasicV::getV28).collect(Collectors.toList()); + List data40 = valueTypeList.stream().map(DataHarmphasicV::getV29).collect(Collectors.toList()); + List data41 = valueTypeList.stream().map(DataHarmphasicV::getV30).collect(Collectors.toList()); + List data42 = valueTypeList.stream().map(DataHarmphasicV::getV31).collect(Collectors.toList()); + List data43 = valueTypeList.stream().map(DataHarmphasicV::getV32).collect(Collectors.toList()); + List data44 = valueTypeList.stream().map(DataHarmphasicV::getV33).collect(Collectors.toList()); + List data45 = valueTypeList.stream().map(DataHarmphasicV::getV34).collect(Collectors.toList()); + List data46 = valueTypeList.stream().map(DataHarmphasicV::getV35).collect(Collectors.toList()); + List data47 = valueTypeList.stream().map(DataHarmphasicV::getV36).collect(Collectors.toList()); + List data48 = valueTypeList.stream().map(DataHarmphasicV::getV37).collect(Collectors.toList()); + List data49 = valueTypeList.stream().map(DataHarmphasicV::getV38).collect(Collectors.toList()); + List data50 = valueTypeList.stream().map(DataHarmphasicV::getV39).collect(Collectors.toList()); + List data51 = valueTypeList.stream().map(DataHarmphasicV::getV40).collect(Collectors.toList()); + List data52 = valueTypeList.stream().map(DataHarmphasicV::getV41).collect(Collectors.toList()); + List data53 = valueTypeList.stream().map(DataHarmphasicV::getV42).collect(Collectors.toList()); + List data54 = valueTypeList.stream().map(DataHarmphasicV::getV43).collect(Collectors.toList()); + List data55 = valueTypeList.stream().map(DataHarmphasicV::getV44).collect(Collectors.toList()); + List data56 = valueTypeList.stream().map(DataHarmphasicV::getV45).collect(Collectors.toList()); + List data57 = valueTypeList.stream().map(DataHarmphasicV::getV46).collect(Collectors.toList()); + List data58 = valueTypeList.stream().map(DataHarmphasicV::getV47).collect(Collectors.toList()); + List data59 = valueTypeList.stream().map(DataHarmphasicV::getV48).collect(Collectors.toList()); + List data60 = valueTypeList.stream().map(DataHarmphasicV::getV49).collect(Collectors.toList()); + List data61 = valueTypeList.stream().map(DataHarmphasicV::getV50).collect(Collectors.toList()); + + List> lists = Arrays.asList(data12,data13,data14,data15,data16 + ,data17,data18,data19,data20,data21,data22,data23,data24,data25,data26 + ,data27,data28,data29,data30,data31,data32,data33,data34,data35,data36 + ,data37,data38,data39,data40,data41,data42,data43,data44,data45,data46 + ,data47,data48,data49,data50,data51,data52,data53,data54,data55,data56 + ,data57,data58,data59,data60,data61); + value.setValueList(lists); + valueTypes.add(value); + }); + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List list) { + + } + /** * 按监测点集合、时间条件获取分钟数据 * 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 6b333b8..e5630a1 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,15 +1,20 @@ package com.njcn.dataProcess.service.impl.influxdb; import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; -import com.njcn.dataProcess.dto.DataHarmpowerPDTO; 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.DataI; -import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerPD; import com.njcn.dataProcess.service.IDataHarmpowerP; +import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; @@ -19,10 +24,7 @@ import org.springframework.stereotype.Service; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -34,7 +36,7 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataHarmpowerPImpl") @RequiredArgsConstructor -public class InfluxdbDataHarmpowerPImpl implements IDataHarmpowerP { +public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl implements IDataHarmpowerP { private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -72,8 +74,113 @@ public class InfluxdbDataHarmpowerPImpl implements IDataHarmpowerP { return result; } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(data)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = data.stream().collect(Collectors.groupingBy(DataHarmpowerP::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataHarmpowerP::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + //以数据类型分组 + Map> valueTypeMap = phasicTypeList.stream().collect(Collectors.groupingBy(DataHarmpowerP::getValueType)); + List valueTypes = new ArrayList<>(); + valueTypeMap.forEach((valueType,valueTypeList)->{ + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(valueType); + //规定好集合指标参数 + List data1 = valueTypeList.stream().map(DataHarmpowerP::getDf).collect(Collectors.toList()); + List data2 = valueTypeList.stream().map(DataHarmpowerP::getPf).collect(Collectors.toList()); + List data3 = valueTypeList.stream().map(DataHarmpowerP::getP).collect(Collectors.toList()); + + List data12 = valueTypeList.stream().map(DataHarmpowerP::getP1).collect(Collectors.toList()); + List data13 = valueTypeList.stream().map(DataHarmpowerP::getP2).collect(Collectors.toList()); + List data14 = valueTypeList.stream().map(DataHarmpowerP::getP3).collect(Collectors.toList()); + List data15 = valueTypeList.stream().map(DataHarmpowerP::getP4).collect(Collectors.toList()); + List data16 = valueTypeList.stream().map(DataHarmpowerP::getP5).collect(Collectors.toList()); + List data17 = valueTypeList.stream().map(DataHarmpowerP::getP6).collect(Collectors.toList()); + List data18 = valueTypeList.stream().map(DataHarmpowerP::getP7).collect(Collectors.toList()); + List data19 = valueTypeList.stream().map(DataHarmpowerP::getP8).collect(Collectors.toList()); + List data20 = valueTypeList.stream().map(DataHarmpowerP::getP9).collect(Collectors.toList()); + List data21 = valueTypeList.stream().map(DataHarmpowerP::getP10).collect(Collectors.toList()); + List data22 = valueTypeList.stream().map(DataHarmpowerP::getP11).collect(Collectors.toList()); + List data23 = valueTypeList.stream().map(DataHarmpowerP::getP12).collect(Collectors.toList()); + List data24 = valueTypeList.stream().map(DataHarmpowerP::getP13).collect(Collectors.toList()); + List data25 = valueTypeList.stream().map(DataHarmpowerP::getP14).collect(Collectors.toList()); + List data26 = valueTypeList.stream().map(DataHarmpowerP::getP15).collect(Collectors.toList()); + List data27 = valueTypeList.stream().map(DataHarmpowerP::getP16).collect(Collectors.toList()); + List data28 = valueTypeList.stream().map(DataHarmpowerP::getP17).collect(Collectors.toList()); + List data29 = valueTypeList.stream().map(DataHarmpowerP::getP18).collect(Collectors.toList()); + List data30 = valueTypeList.stream().map(DataHarmpowerP::getP19).collect(Collectors.toList()); + List data31 = valueTypeList.stream().map(DataHarmpowerP::getP20).collect(Collectors.toList()); + List data32 = valueTypeList.stream().map(DataHarmpowerP::getP21).collect(Collectors.toList()); + List data33 = valueTypeList.stream().map(DataHarmpowerP::getP22).collect(Collectors.toList()); + List data34 = valueTypeList.stream().map(DataHarmpowerP::getP23).collect(Collectors.toList()); + List data35 = valueTypeList.stream().map(DataHarmpowerP::getP24).collect(Collectors.toList()); + List data36 = valueTypeList.stream().map(DataHarmpowerP::getP25).collect(Collectors.toList()); + List data37 = valueTypeList.stream().map(DataHarmpowerP::getP26).collect(Collectors.toList()); + List data38 = valueTypeList.stream().map(DataHarmpowerP::getP27).collect(Collectors.toList()); + List data39 = valueTypeList.stream().map(DataHarmpowerP::getP28).collect(Collectors.toList()); + List data40 = valueTypeList.stream().map(DataHarmpowerP::getP29).collect(Collectors.toList()); + List data41 = valueTypeList.stream().map(DataHarmpowerP::getP30).collect(Collectors.toList()); + List data42 = valueTypeList.stream().map(DataHarmpowerP::getP31).collect(Collectors.toList()); + List data43 = valueTypeList.stream().map(DataHarmpowerP::getP32).collect(Collectors.toList()); + List data44 = valueTypeList.stream().map(DataHarmpowerP::getP33).collect(Collectors.toList()); + List data45 = valueTypeList.stream().map(DataHarmpowerP::getP34).collect(Collectors.toList()); + List data46 = valueTypeList.stream().map(DataHarmpowerP::getP35).collect(Collectors.toList()); + List data47 = valueTypeList.stream().map(DataHarmpowerP::getP36).collect(Collectors.toList()); + List data48 = valueTypeList.stream().map(DataHarmpowerP::getP37).collect(Collectors.toList()); + List data49 = valueTypeList.stream().map(DataHarmpowerP::getP38).collect(Collectors.toList()); + List data50 = valueTypeList.stream().map(DataHarmpowerP::getP39).collect(Collectors.toList()); + List data51 = valueTypeList.stream().map(DataHarmpowerP::getP40).collect(Collectors.toList()); + List data52 = valueTypeList.stream().map(DataHarmpowerP::getP41).collect(Collectors.toList()); + List data53 = valueTypeList.stream().map(DataHarmpowerP::getP42).collect(Collectors.toList()); + List data54 = valueTypeList.stream().map(DataHarmpowerP::getP43).collect(Collectors.toList()); + List data55 = valueTypeList.stream().map(DataHarmpowerP::getP44).collect(Collectors.toList()); + List data56 = valueTypeList.stream().map(DataHarmpowerP::getP45).collect(Collectors.toList()); + List data57 = valueTypeList.stream().map(DataHarmpowerP::getP46).collect(Collectors.toList()); + List data58 = valueTypeList.stream().map(DataHarmpowerP::getP47).collect(Collectors.toList()); + List data59 = valueTypeList.stream().map(DataHarmpowerP::getP48).collect(Collectors.toList()); + List data60 = valueTypeList.stream().map(DataHarmpowerP::getP49).collect(Collectors.toList()); + List data61 = valueTypeList.stream().map(DataHarmpowerP::getP50).collect(Collectors.toList()); + + List> lists = Arrays.asList(data1,data2,data3,data12,data13,data14 + ,data15,data16,data17,data18,data19,data20,data21,data22,data23,data24 + ,data25,data26,data27,data28,data29,data30,data31,data32,data33,data34 + ,data35,data36,data37,data38,data39,data40,data41,data42,data43,data44 + ,data45,data46,data47,data48,data49,data50,data51,data52,data53,data54 + ,data55,data56,data57,data58,data59,data60,data61); + value.setValueList(lists); + valueTypes.add(value); + }); + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List list) { + + } + /** - * 按监测点集合、时间条件获取dataI分钟数据 + * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 * 需要进行剔除异常数据时,这里会有三种情况判断 * 1.无异常数据，则直接返回集合； 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 75c8344..7458572 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,15 +1,28 @@ package com.njcn.dataProcess.service.impl.influxdb; -import com.njcn.dataProcess.dto.DataHarmpowerQDTO; +import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.utils.HarmonicTimesUtil; 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.DataHarmpowerQ; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD; import com.njcn.dataProcess.service.IDataHarmpowerQ; +import com.njcn.dataProcess.util.TimeUtils; +import com.njcn.influx.constant.InfluxDbSqlConstant; +import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.*; import java.util.stream.Collectors; /** @@ -21,8 +34,9 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataHarmpowerQImpl") @RequiredArgsConstructor -public class InfluxdbDataHarmpowerQImpl implements IDataHarmpowerQ { +public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl implements IDataHarmpowerQ { + private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); private final DataHarmpowerQMapper dataHarmpowerQMapper; @@ -43,4 +57,160 @@ public class InfluxdbDataHarmpowerQImpl implements IDataHarmpowerQ { } } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(data)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = data.stream().collect(Collectors.groupingBy(DataHarmpowerQ::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataHarmpowerQ::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + //以数据类型分组 + Map> valueTypeMap = phasicTypeList.stream().collect(Collectors.groupingBy(DataHarmpowerQ::getValueType)); + List valueTypes = new ArrayList<>(); + valueTypeMap.forEach((valueType,valueTypeList)->{ + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(valueType); + //规定好集合指标参数 + List data1 = valueTypeList.stream().map(DataHarmpowerQ::getQ).collect(Collectors.toList()); + + List data12 = valueTypeList.stream().map(DataHarmpowerQ::getQ1).collect(Collectors.toList()); + List data13 = valueTypeList.stream().map(DataHarmpowerQ::getQ2).collect(Collectors.toList()); + List data14 = valueTypeList.stream().map(DataHarmpowerQ::getQ3).collect(Collectors.toList()); + List data15 = valueTypeList.stream().map(DataHarmpowerQ::getQ4).collect(Collectors.toList()); + List data16 = valueTypeList.stream().map(DataHarmpowerQ::getQ5).collect(Collectors.toList()); + List data17 = valueTypeList.stream().map(DataHarmpowerQ::getQ6).collect(Collectors.toList()); + List data18 = valueTypeList.stream().map(DataHarmpowerQ::getQ7).collect(Collectors.toList()); + List data19 = valueTypeList.stream().map(DataHarmpowerQ::getQ8).collect(Collectors.toList()); + List data20 = valueTypeList.stream().map(DataHarmpowerQ::getQ9).collect(Collectors.toList()); + List data21 = valueTypeList.stream().map(DataHarmpowerQ::getQ10).collect(Collectors.toList()); + List data22 = valueTypeList.stream().map(DataHarmpowerQ::getQ11).collect(Collectors.toList()); + List data23 = valueTypeList.stream().map(DataHarmpowerQ::getQ12).collect(Collectors.toList()); + List data24 = valueTypeList.stream().map(DataHarmpowerQ::getQ13).collect(Collectors.toList()); + List data25 = valueTypeList.stream().map(DataHarmpowerQ::getQ14).collect(Collectors.toList()); + List data26 = valueTypeList.stream().map(DataHarmpowerQ::getQ15).collect(Collectors.toList()); + List data27 = valueTypeList.stream().map(DataHarmpowerQ::getQ16).collect(Collectors.toList()); + List data28 = valueTypeList.stream().map(DataHarmpowerQ::getQ17).collect(Collectors.toList()); + List data29 = valueTypeList.stream().map(DataHarmpowerQ::getQ18).collect(Collectors.toList()); + List data30 = valueTypeList.stream().map(DataHarmpowerQ::getQ19).collect(Collectors.toList()); + List data31 = valueTypeList.stream().map(DataHarmpowerQ::getQ20).collect(Collectors.toList()); + List data32 = valueTypeList.stream().map(DataHarmpowerQ::getQ21).collect(Collectors.toList()); + List data33 = valueTypeList.stream().map(DataHarmpowerQ::getQ22).collect(Collectors.toList()); + List data34 = valueTypeList.stream().map(DataHarmpowerQ::getQ23).collect(Collectors.toList()); + List data35 = valueTypeList.stream().map(DataHarmpowerQ::getQ24).collect(Collectors.toList()); + List data36 = valueTypeList.stream().map(DataHarmpowerQ::getQ25).collect(Collectors.toList()); + List data37 = valueTypeList.stream().map(DataHarmpowerQ::getQ26).collect(Collectors.toList()); + List data38 = valueTypeList.stream().map(DataHarmpowerQ::getQ27).collect(Collectors.toList()); + List data39 = valueTypeList.stream().map(DataHarmpowerQ::getQ28).collect(Collectors.toList()); + List data40 = valueTypeList.stream().map(DataHarmpowerQ::getQ29).collect(Collectors.toList()); + List data41 = valueTypeList.stream().map(DataHarmpowerQ::getQ30).collect(Collectors.toList()); + List data42 = valueTypeList.stream().map(DataHarmpowerQ::getQ31).collect(Collectors.toList()); + List data43 = valueTypeList.stream().map(DataHarmpowerQ::getQ32).collect(Collectors.toList()); + List data44 = valueTypeList.stream().map(DataHarmpowerQ::getQ33).collect(Collectors.toList()); + List data45 = valueTypeList.stream().map(DataHarmpowerQ::getQ34).collect(Collectors.toList()); + List data46 = valueTypeList.stream().map(DataHarmpowerQ::getQ35).collect(Collectors.toList()); + List data47 = valueTypeList.stream().map(DataHarmpowerQ::getQ36).collect(Collectors.toList()); + List data48 = valueTypeList.stream().map(DataHarmpowerQ::getQ37).collect(Collectors.toList()); + List data49 = valueTypeList.stream().map(DataHarmpowerQ::getQ38).collect(Collectors.toList()); + List data50 = valueTypeList.stream().map(DataHarmpowerQ::getQ39).collect(Collectors.toList()); + List data51 = valueTypeList.stream().map(DataHarmpowerQ::getQ40).collect(Collectors.toList()); + List data52 = valueTypeList.stream().map(DataHarmpowerQ::getQ41).collect(Collectors.toList()); + List data53 = valueTypeList.stream().map(DataHarmpowerQ::getQ42).collect(Collectors.toList()); + List data54 = valueTypeList.stream().map(DataHarmpowerQ::getQ43).collect(Collectors.toList()); + List data55 = valueTypeList.stream().map(DataHarmpowerQ::getQ44).collect(Collectors.toList()); + List data56 = valueTypeList.stream().map(DataHarmpowerQ::getQ45).collect(Collectors.toList()); + List data57 = valueTypeList.stream().map(DataHarmpowerQ::getQ46).collect(Collectors.toList()); + List data58 = valueTypeList.stream().map(DataHarmpowerQ::getQ47).collect(Collectors.toList()); + List data59 = valueTypeList.stream().map(DataHarmpowerQ::getQ48).collect(Collectors.toList()); + List data60 = valueTypeList.stream().map(DataHarmpowerQ::getQ49).collect(Collectors.toList()); + List data61 = valueTypeList.stream().map(DataHarmpowerQ::getQ50).collect(Collectors.toList()); + + List> lists = Arrays.asList(data1,data12,data13,data14 + ,data15,data16,data17,data18,data19,data20,data21,data22,data23,data24 + ,data25,data26,data27,data28,data29,data30,data31,data32,data33,data34 + ,data35,data36,data37,data38,data39,data40,data41,data42,data43,data44 + ,data45,data46,data47,data48,data49,data50,data51,data52,data53,data54 + ,data55,data56,data57,data58,data59,data60,data61); + value.setValueList(lists); + valueTypes.add(value); + }); + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List list) { + + } + + /** + * 按监测点集合、时间条件获取分钟数据 + * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 + * 需要进行剔除异常数据时,这里会有三种情况判断 + * 1.无异常数据，则直接返回集合； + * 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据； + * 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常 + */ + public List getMinuteData(List lineList, String startTime, String endTime, Map> timeMap) { + List result = new ArrayList<>(); + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.regular(DataHarmpowerQ::getLineId, lineList) + .select(DataHarmpowerQ::getLineId) + .select(DataHarmpowerQ::getPhasicType) + .select(DataHarmpowerQ::getValueType) + .select(DataHarmpowerQ::getQ) + .select(DataHarmpowerQ::getQualityFlag) + .between(DataHarmpowerQ::getTime, startTime, endTime) + .eq(DataHarmpowerQ::getQualityFlag,"0"); + List 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); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } + } + //没有异常数据，则使用原数据 + else { + result.addAll(v); + } + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(list); + } + 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 319d5dc..63833f1 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 @@ -1,13 +1,18 @@ package com.njcn.dataProcess.service.impl.influxdb; import cn.hutool.core.collection.CollectionUtil; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; import com.njcn.dataProcess.dao.imapper.DataIMapper; +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.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.po.RStatDataID; import com.njcn.dataProcess.service.IDataI; +import com.njcn.dataProcess.util.TimeUtils; import com.njcn.influx.constant.InfluxDbSqlConstant; import com.njcn.influx.query.InfluxQueryWrapper; import lombok.RequiredArgsConstructor; @@ -18,6 +23,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.stream.Collectors; @@ -31,7 +37,7 @@ import java.util.stream.Collectors; */ @Service("InfluxdbDataIImpl") @RequiredArgsConstructor -public class InfluxdbDataIImpl implements IDataI { +public class InfluxdbDataIImpl extends MppServiceImpl implements IDataI { private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()); @@ -69,6 +75,115 @@ public class InfluxdbDataIImpl implements IDataI { return result; } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + List result = new ArrayList<>(); + List dataIList = getMinuteDataI(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime()); + if (CollectionUtil.isNotEmpty(dataIList)) { + String time = TimeUtils.StringTimeToString(lineParam.getStartTime()); + //以监测点分组 + Map> lineMap = dataIList.stream().collect(Collectors.groupingBy(DataI::getLineId)); + lineMap.forEach((line,lineList)->{ + CommonMinuteDto dto = new CommonMinuteDto(); + dto.setLineId(line); + dto.setTime(time); + dto.setQualityFlag(lineList.get(0).getQualityFlag()); + //以相别分组 + Map> phasicTypeMap = lineList.stream().collect(Collectors.groupingBy(DataI::getPhasicType)); + List phasicTypes = new ArrayList<>(); + phasicTypeMap.forEach((phasicType,phasicTypeList)->{ + CommonMinuteDto.PhasicType type = new CommonMinuteDto.PhasicType(); + type.setPhasicType(phasicType); + //以数据类型分组 + Map> valueTypeMap = phasicTypeList.stream().collect(Collectors.groupingBy(DataI::getValueType)); + List valueTypes = new ArrayList<>(); + valueTypeMap.forEach((valueType,valueTypeList)->{ + CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); + value.setValueType(valueType); + //规定好集合指标参数 + List data1 = valueTypeList.stream().map(DataI::getINeg).collect(Collectors.toList()); + List data2 = valueTypeList.stream().map(DataI::getIPos).collect(Collectors.toList()); + List data3 = valueTypeList.stream().map(DataI::getIThd).collect(Collectors.toList()); + List data4 = valueTypeList.stream().map(DataI::getIUnbalance).collect(Collectors.toList()); + List data5 = valueTypeList.stream().map(DataI::getIZero).collect(Collectors.toList()); + List data6 = valueTypeList.stream().map(DataI::getRms).collect(Collectors.toList()); + + List data12 = valueTypeList.stream().map(DataI::getI1).collect(Collectors.toList()); + List data13 = valueTypeList.stream().map(DataI::getI2).collect(Collectors.toList()); + List data14 = valueTypeList.stream().map(DataI::getI3).collect(Collectors.toList()); + List data15 = valueTypeList.stream().map(DataI::getI4).collect(Collectors.toList()); + List data16 = valueTypeList.stream().map(DataI::getI5).collect(Collectors.toList()); + List data17 = valueTypeList.stream().map(DataI::getI6).collect(Collectors.toList()); + List data18 = valueTypeList.stream().map(DataI::getI7).collect(Collectors.toList()); + List data19 = valueTypeList.stream().map(DataI::getI8).collect(Collectors.toList()); + List data20 = valueTypeList.stream().map(DataI::getI9).collect(Collectors.toList()); + List data21 = valueTypeList.stream().map(DataI::getI10).collect(Collectors.toList()); + List data22 = valueTypeList.stream().map(DataI::getI11).collect(Collectors.toList()); + List data23 = valueTypeList.stream().map(DataI::getI12).collect(Collectors.toList()); + List data24 = valueTypeList.stream().map(DataI::getI13).collect(Collectors.toList()); + List data25 = valueTypeList.stream().map(DataI::getI14).collect(Collectors.toList()); + List data26 = valueTypeList.stream().map(DataI::getI15).collect(Collectors.toList()); + List data27 = valueTypeList.stream().map(DataI::getI16).collect(Collectors.toList()); + List data28 = valueTypeList.stream().map(DataI::getI17).collect(Collectors.toList()); + List data29 = valueTypeList.stream().map(DataI::getI18).collect(Collectors.toList()); + List data30 = valueTypeList.stream().map(DataI::getI19).collect(Collectors.toList()); + List data31 = valueTypeList.stream().map(DataI::getI20).collect(Collectors.toList()); + List data32 = valueTypeList.stream().map(DataI::getI21).collect(Collectors.toList()); + List data33 = valueTypeList.stream().map(DataI::getI22).collect(Collectors.toList()); + List data34 = valueTypeList.stream().map(DataI::getI23).collect(Collectors.toList()); + List data35 = valueTypeList.stream().map(DataI::getI24).collect(Collectors.toList()); + List data36 = valueTypeList.stream().map(DataI::getI25).collect(Collectors.toList()); + List data37 = valueTypeList.stream().map(DataI::getI26).collect(Collectors.toList()); + List data38 = valueTypeList.stream().map(DataI::getI27).collect(Collectors.toList()); + List data39 = valueTypeList.stream().map(DataI::getI28).collect(Collectors.toList()); + List data40 = valueTypeList.stream().map(DataI::getI29).collect(Collectors.toList()); + List data41 = valueTypeList.stream().map(DataI::getI30).collect(Collectors.toList()); + List data42 = valueTypeList.stream().map(DataI::getI31).collect(Collectors.toList()); + List data43 = valueTypeList.stream().map(DataI::getI32).collect(Collectors.toList()); + List data44 = valueTypeList.stream().map(DataI::getI33).collect(Collectors.toList()); + List data45 = valueTypeList.stream().map(DataI::getI34).collect(Collectors.toList()); + List data46 = valueTypeList.stream().map(DataI::getI35).collect(Collectors.toList()); + List data47 = valueTypeList.stream().map(DataI::getI36).collect(Collectors.toList()); + List data48 = valueTypeList.stream().map(DataI::getI37).collect(Collectors.toList()); + List data49 = valueTypeList.stream().map(DataI::getI38).collect(Collectors.toList()); + List data50 = valueTypeList.stream().map(DataI::getI39).collect(Collectors.toList()); + List data51 = valueTypeList.stream().map(DataI::getI40).collect(Collectors.toList()); + List data52 = valueTypeList.stream().map(DataI::getI41).collect(Collectors.toList()); + List data53 = valueTypeList.stream().map(DataI::getI42).collect(Collectors.toList()); + List data54 = valueTypeList.stream().map(DataI::getI43).collect(Collectors.toList()); + List data55 = valueTypeList.stream().map(DataI::getI44).collect(Collectors.toList()); + List data56 = valueTypeList.stream().map(DataI::getI45).collect(Collectors.toList()); + List data57 = valueTypeList.stream().map(DataI::getI46).collect(Collectors.toList()); + List data58 = valueTypeList.stream().map(DataI::getI47).collect(Collectors.toList()); + List data59 = valueTypeList.stream().map(DataI::getI48).collect(Collectors.toList()); + List data60 = valueTypeList.stream().map(DataI::getI49).collect(Collectors.toList()); + List data61 = valueTypeList.stream().map(DataI::getI50).collect(Collectors.toList()); + + List> lists = Arrays.asList(data1,data2,data3,data4,data5,data6 + ,data12,data13,data14,data15,data16,data17,data18,data19,data20 + ,data21,data22,data23,data24,data25,data26,data27,data28,data29,data30 + ,data31,data32,data33,data34,data35,data36,data37,data38,data39,data40 + ,data41,data42,data43,data44,data45,data46,data47,data48,data49,data50 + ,data51,data52,data53,data54,data55,data56,data57,data58,data59,data60 + ,data61); + value.setValueList(lists); + valueTypes.add(value); + }); + type.setValueTypeList(valueTypes); + phasicTypes.add(type); + }); + dto.setPhasicTypeList(phasicTypes); + result.add(dto); + }); + } + return result; + } + + @Override + public void addList(List dataIDtoList) { + + } + /** * 按监测点集合、时间条件获取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 4d72ce0..d9a8c73 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 @@ -1,18 +1,24 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataFlickerDTO; - +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataFlickerRelationMapper; +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.relation.DataFlicker; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlickerDto; +import com.njcn.dataProcess.pojo.po.RStatDataFlickerD; import com.njcn.dataProcess.service.IDataFlicker; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -26,9 +32,12 @@ import java.util.stream.Collectors; */ @Service("RelationDataFlickerImpl") @RequiredArgsConstructor -public class RelationDataFlickerImpl implements IDataFlicker { +public class RelationDataFlickerImpl extends MppServiceImpl implements IDataFlicker { private final DataFlickerRelationMapper dataFlickerRelationMapper; + @Resource + private IDataFlicker dataFlicker; + @Override public void batchInsertion(List dataFlickerDTOList) { int totalCount = dataFlickerDTOList.size(); @@ -61,4 +70,23 @@ public class RelationDataFlickerImpl implements IDataFlicker { public List getRawData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List dataIDtoList) { + List result = new ArrayList<>(); + dataIDtoList.forEach(item->{ + RStatDataFlickerD data = new RStatDataFlickerD(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataFlicker.saveOrUpdateBatchByMultiId(result); + } } 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 c265129..a394e2a 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 @@ -1,18 +1,24 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataFlucDTO; - +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataFlucRelationMapper; +import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlucRelationMapper; +import com.njcn.dataProcess.dto.DataFlucDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.relation.DataFluc; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataFlucDto; +import com.njcn.dataProcess.pojo.po.RStatDataFlucD; import com.njcn.dataProcess.service.IDataFluc; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -26,8 +32,11 @@ import java.util.stream.Collectors; */ @Service("RelationDataFlucImpl") @RequiredArgsConstructor -public class RelationDataFlucImpl implements IDataFluc { +public class RelationDataFlucImpl extends MppServiceImpl implements IDataFluc { private final DataFlucRelationMapper dataFlucRelationMapper; + + @Resource + private IDataFluc dataFluc; @Override public void batchInsertion(List dataFlucDTOList) { int totalCount = dataFlucDTOList.size(); @@ -53,5 +62,24 @@ public class RelationDataFlucImpl implements IDataFluc { return Collections.emptyList(); } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List dataFlucDtoList) { + List result = new ArrayList<>(); + dataFlucDtoList.forEach(item->{ + RStatDataFlucD data = new RStatDataFlucD(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataFluc.saveOrUpdateBatchByMultiId(result); + } + ; } 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 76d4153..499dd13 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 @@ -1,16 +1,25 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataHarmphasicIDTO; - +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataHarmphasicIRelationMapper; +import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicIRelationMapper; +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.DataHarmPhasicIDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicID; import com.njcn.dataProcess.service.IDataHarmphasicI; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -23,10 +32,13 @@ import java.util.stream.Collectors; */ @Service("RelationDataHarmphasicIImpl") @RequiredArgsConstructor -public class RelationDataHarmphasicIImpl implements IDataHarmphasicI { +public class RelationDataHarmphasicIImpl extends MppServiceImpl implements IDataHarmphasicI { private final DataHarmphasicIRelationMapper dataHarmphasicIRelationMapper; + @Resource + private IDataHarmphasicI dataHarmphasicI; + @Override public void batchInsertion(List dataHarmphasicIDTOList) { int totalCount = dataHarmphasicIDTOList.size(); @@ -54,4 +66,23 @@ public class RelationDataHarmphasicIImpl implements IDataHarmphasicI { } } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List list) { + List result = new ArrayList<>(); + list.forEach(item->{ + RStatDataHarmPhasicID data = new RStatDataHarmPhasicID(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataHarmphasicI.saveOrUpdateBatchByMultiId(result); + } } 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 2e0fea0..a580abb 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 @@ -1,17 +1,25 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataHarmphasicVDTO; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataHarmphasicVRelationMapper; +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.relation.DataHarmphasicV; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPhasicVDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPhasicVD; import com.njcn.dataProcess.service.IDataHarmphasicV; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -25,8 +33,12 @@ import java.util.stream.Collectors; */ @Service("RelationDataHarmphasicVImpl") @RequiredArgsConstructor -public class RelationDataHarmphasicVImpl implements IDataHarmphasicV { +public class RelationDataHarmphasicVImpl extends MppServiceImpl implements IDataHarmphasicV { + private final DataHarmphasicVRelationMapper dataHarmphasicVRelationMapper; + @Resource + private IDataHarmphasicV dataHarmphasicV; + @Override public void batchInsertion(List dataHarmphasicVDTOList) { int totalCount = dataHarmphasicVDTOList.size(); @@ -58,5 +70,24 @@ public class RelationDataHarmphasicVImpl implements IDataHarmphasicV { return Collections.emptyList(); } + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List list) { + List result = new ArrayList<>(); + list.forEach(item->{ + RStatDataHarmPhasicVD data = new RStatDataHarmPhasicVD(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataHarmphasicV.saveOrUpdateBatchByMultiId(result); + } + } 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 c0283c0..a8595bd 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 @@ -1,18 +1,25 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataHarmpowerPDTO; - +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataHarmpowerPRelationMapper; +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.relation.DataHarmpowerP; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerPDto; import com.njcn.dataProcess.pojo.dto.DataPowerPDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerPD; import com.njcn.dataProcess.service.IDataHarmpowerP; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -26,9 +33,11 @@ import java.util.stream.Collectors; */ @Service("RelationDataHarmpowerPImpl") @RequiredArgsConstructor -public class RelationDataHarmpowerPImpl implements IDataHarmpowerP { +public class RelationDataHarmpowerPImpl extends MppServiceImpl implements IDataHarmpowerP { private final DataHarmpowerPRelationMapper dataHarmpowerPRelationMapper; + @Resource + private IDataHarmpowerP dataHarmPowerP; @Override public void batchInsertion(List dataHarmpowerPDTOList) { @@ -61,4 +70,23 @@ public class RelationDataHarmpowerPImpl implements IDataHarmpowerP { public List getRawData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List list) { + List result = new ArrayList<>(); + list.forEach(item->{ + RStatDataHarmPowerPD data = new RStatDataHarmPowerPD(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataHarmPowerP.saveOrUpdateBatchByMultiId(result); + } } 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 944615f..57cb849 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 @@ -1,16 +1,26 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataHarmpowerQDTO; -import com.njcn.dataProcess.po.relation.DataHarmpowerQ; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataHarmpowerQRelationMapper; +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.relation.DataHarmpowerQ; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmPowerQDto; +import com.njcn.dataProcess.pojo.po.RStatDataHarmPowerQD; import com.njcn.dataProcess.service.IDataHarmpowerQ; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -24,8 +34,10 @@ import java.util.stream.Collectors; @Service("RelationDataHarmpowerQImpl") @RequiredArgsConstructor @Slf4j -public class RelationDataHarmpowerQImpl implements IDataHarmpowerQ { +public class RelationDataHarmpowerQImpl extends MppServiceImpl implements IDataHarmpowerQ { private final DataHarmpowerQRelationMapper dataHarmpowerQRelationMapper; + @Resource + private IDataHarmpowerQ dataHarmpowerQ; @Override public void batchInsertion(List dataHarmpowerQDTOList) { int totalCount = dataHarmpowerQDTOList.size(); @@ -56,4 +68,23 @@ public class RelationDataHarmpowerQImpl implements IDataHarmpowerQ { } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List list) { + List result = new ArrayList<>(); + list.forEach(item->{ + RStatDataHarmPowerQD data = new RStatDataHarmPowerQD(); + data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + data.setPhasicType(item.getPhasicType()); + data.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, data); + result.add(data); + }); + dataHarmpowerQ.saveOrUpdateBatchByMultiId(result); + } } 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 ebb2812..2ea5656 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 @@ -1,19 +1,24 @@ package com.njcn.dataProcess.service.impl.relation; -import com.njcn.dataProcess.dto.DataIDTO; - +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.relation.DataI; +import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.po.RStatDataID; import com.njcn.dataProcess.service.IDataI; import com.njcn.dataProcess.util.BeanFeildUtils; +import com.njcn.dataProcess.util.TimeUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -27,9 +32,14 @@ import java.util.stream.Collectors; */ @Service("RelationDataIImpl") @RequiredArgsConstructor -public class RelationDataIImpl implements IDataI { +public class RelationDataIImpl extends MppServiceImpl implements IDataI { @Resource private DataIRelationMapper dataIRelationMapper; + + @Resource + private IDataI iDataI; + + @Override public void batchInsertion(List dataIDTOList) { int totalCount = dataIDTOList.size(); @@ -59,4 +69,23 @@ public class RelationDataIImpl implements IDataI { public List getRawData(LineCountEvaluateParam lineParam) { return Collections.emptyList(); } + + @Override + public List getBaseData(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + + @Override + public void addList(List dataIDtoList) { + List result = new ArrayList<>(); + dataIDtoList.forEach(item->{ + RStatDataID dataI = new RStatDataID(); + dataI.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); + dataI.setPhasicType(item.getPhasicType()); + dataI.setQualityFlag(Integer.valueOf(item.getQualityFlag())); + BeanUtils.copyProperties(item, dataI); + result.add(dataI); + }); + iDataI.saveOrUpdateBatchByMultiId(result); + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java index e234ba5..1bbbfbb 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java @@ -41,7 +41,6 @@ public class RelationDataVImpl extends MppServiceImpl