From 7a0b0cc943439b9b2a48fcac573ff0e56018bcd0 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 25 Jul 2025 17:27:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B1=A1=E6=9F=93=E5=80=BC=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=202.=E5=A2=9E=E5=8A=A0=E6=9A=82=E6=80=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A5=E6=8B=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/MeasurementExecutor.java | 17 +- .../service/line/IPollutionCalc.java | 17 ++ .../line/DataCleanServiceImpl.java | 32 ++- .../line/IDataCrossingServiceImpl.java | 8 +- .../serviceimpl/line/PollutionCalcImpl.java | 244 ++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../api/DataHarmRateVFeignClient.java | 3 + .../dataProcess/api/DataIFeignClient.java | 9 +- .../dataProcess/api/DataVFeignClient.java | 5 + ...taHarmRateVFeignClientFallbackFactory.java | 6 + .../DataIFeignClientFallbackFactory.java | 6 + .../DataVFeignClientFallbackFactory.java | 6 + .../controller/DataHarmRateVController.java | 13 +- .../controller/DataIController.java | 9 + .../controller/DataVController.java | 15 +- .../dataProcess/service/IDataHarmRateV.java | 1 + .../com/njcn/dataProcess/service/IDataI.java | 6 + .../com/njcn/dataProcess/service/IDataV.java | 2 + .../influxdb/InfluxdbDataHarmRateVImpl.java | 22 ++ .../impl/influxdb/InfluxdbDataIImpl.java | 22 ++ .../impl/influxdb/InfluxdbDataVImpl.java | 19 ++ .../relation/RelationDataHarmRateVImpl.java | 5 + .../impl/relation/RelationDataIImpl.java | 5 + .../impl/relation/RelationDataVImpl.java | 5 + .../MigrationInfluxDBController.java | 44 ++-- .../read/job/MigrationInfluxDBJob.java | 15 +- .../read/service/MigrationService.java | 2 + .../service/impl/MigrationServiceImpl.java | 12 +- 28 files changed, 499 insertions(+), 53 deletions(-) create mode 100644 algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IPollutionCalc.java create mode 100644 algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.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 a259cd2..7c4c159 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 @@ -37,7 +37,8 @@ public class MeasurementExecutor extends BaseExecutor { private IDataComAssService dataComAssService; @Resource private IPollutionService pollutionService; - + @Resource + private IPollutionCalc pollutionCalc; /** * 数据质量清洗 */ @@ -450,6 +451,20 @@ public class MeasurementExecutor extends BaseExecutor { pollutionService.handleDay(bindCmp.getRequestData()); } + /** + * 监测点污区图 + * @param bindCmp + * @return + */ + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataPollutionCalc", nodeType = NodeTypeEnum.COMMON) + public boolean dataPollutionCalcAccess(NodeComponent bindCmp) { + return isAccess(bindCmp); + } + + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataPollutionCalc", nodeType = NodeTypeEnum.COMMON) + public void dataPollutionCalcProcess(NodeComponent bindCmp) { + pollutionCalc.calcAllLineValue(bindCmp.getRequestData()); + } /** * 监测点数据完整性 diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IPollutionCalc.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IPollutionCalc.java new file mode 100644 index 0000000..6dac073 --- /dev/null +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IPollutionCalc.java @@ -0,0 +1,17 @@ +package com.njcn.algorithm.service.line; + +import com.njcn.algorithm.pojo.bo.CalculatedParam; + +/** + * 污染值算法 + */ +public interface IPollutionCalc { + + /** + * 计算谐波电压、谐波电流 + * @param calculatedParam + * @Author: wr + * @Date: 2025/7/24 14:37 + */ + void calcAllLineValue(CalculatedParam calculatedParam); +} diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java index 11d46b8..7d31dfe 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java @@ -1485,20 +1485,24 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.V_Data.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if (dto.getV1() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getV1() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { - //log.info("dataV-基波电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getV1(), dto.getMinTime()); - PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getV1() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); - list.add(pqDataVerify); + if(ObjectUtil.isNotNull(dto.getV1())){ + if (dto.getV1() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getV1() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + //log.info("dataV-基波电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getV1(), dto.getMinTime()); + PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() + ,dto.getMinTime() + ,dto.getValueType() + ,dto.getPhasicType() + ,pqReasonableRangeDto.getIndexCode() + ,pqReasonableRangeDto.getIndexName() + ,pqReasonableRangeDto.getInfluxdbTableName() + ,dto.getV1() + ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) + ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + list.add(pqDataVerify); + } + }else{ + logger.info("vData{}", dto); } } return list; diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java index 6d29163..24e38fb 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java @@ -815,9 +815,15 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { //负序电流 if (!CollectionUtils.isEmpty(dataIPONegList)) { for (DataIDto item : dataIPONegList) { - if (item.getINeg() > overlimit.getINeg()) { + if(ObjectUtil.isNotNull(item.getINeg())){ + if (item.getINeg() > overlimit.getINeg()) { + addAbnormalData(iNeg, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getINeg(), overlimit.getINeg()); + } + }else{ + System.out.println(item); addAbnormalData(iNeg, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getINeg(), overlimit.getINeg()); } + } } //频率偏差 diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java new file mode 100644 index 0000000..37bfd9a --- /dev/null +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java @@ -0,0 +1,244 @@ +package com.njcn.algorithm.serviceimpl.line; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.algorithm.pojo.bo.CalculatedParam; +import com.njcn.algorithm.service.line.IPollutionCalc; +import com.njcn.common.utils.PubUtils; +import com.njcn.dataProcess.api.DataHarmRateVFeignClient; +import com.njcn.dataProcess.api.DataIFeignClient; +import com.njcn.dataProcess.api.DataPollutionFeignClient; +import com.njcn.dataProcess.api.DataVFeignClient; +import com.njcn.dataProcess.param.LineCountEvaluateParam; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; +import com.njcn.dataProcess.pojo.dto.DataIDto; +import com.njcn.dataProcess.pojo.dto.DataPollutionD; +import com.njcn.dataProcess.pojo.dto.DataVDto; +import com.njcn.dataProcess.util.TimeUtils; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +@Service +@RequiredArgsConstructor +public class PollutionCalcImpl implements IPollutionCalc { + + @Resource + private CommTerminalGeneralClient commTerminalGeneralClient; + @Resource + private DicDataFeignClient dicDataFeignClient; + @Resource + private DataVFeignClient dataVFeignClient; + @Resource + private DataHarmRateVFeignClient dataHarmRateVFeignClient; + @Resource + private DataIFeignClient dataIFeignClient; + @Resource + private DataPollutionFeignClient dataPollutionFeignClient; + + /** + * 监测点污染值计算，谐波电压&谐波电流 + * 1、获取所有监测点； + * 2、根据指标获取对应的污染值，目前仅做谐波电压； + * 注：目前仅支持获取昨天的 + */ + @Override + public void calcAllLineValue(CalculatedParam calculatedParam) { + System.out.println("当前执行监测点污染值算法++++++++++++++++++++++++++++++++++"); + List list = new ArrayList<>(); + List idList = calculatedParam.getIdList(); + List overlimitList = commTerminalGeneralClient.getOverLimitDataByIds(idList).getData(); + Map limitMap = overlimitList.stream().collect(Collectors.toMap(Overlimit::getId, Function.identity())); + List lineDetailList = commTerminalGeneralClient.getMonitorDetailList(idList).getData(); + Map lineDetailMap = lineDetailList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, Function.identity())); + List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_CALC.getCode()).getData(); + Map dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId)); + String vHarmonicLimit = dictData.get(DicDataEnum.V_HARMONIC_LIMIT.getCode()); + String iAllLimit = dictData.get(DicDataEnum.I_ALL_LIMIT.getCode()); + if (CollUtil.isNotEmpty(idList)) { + System.out.println("总共" + idList.size() + "个监测点参与污染值计算，开始执行"); + DataPollutionD dataPollutionD; + LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); + lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); + lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); + for (String id : idList) { + if (lineDetailMap.containsKey(id)) { + LineDevGetDTO line = lineDetailMap.get(id); + if (limitMap.containsKey(id)) { + Overlimit overlimit = limitMap.get(id); + dataPollutionD = new DataPollutionD(); + dataPollutionD.setLineId(id); + dataPollutionD.setDataDate(LocalDateTimeUtil.parseDate(calculatedParam.getDataDate())); + dataPollutionD.setPollutionType(vHarmonicLimit); + lineParam.setValueType(Arrays.asList(line.getTimeInterval() + "")); + lineParam.setLineId(Arrays.asList(id)); + + + List dataVDtoList = dataVFeignClient.getGroupByTimeDataV(lineParam).getData(); + List dataHarmDtoList = dataHarmRateVFeignClient.getGroupByTimeHarmRateV(lineParam).getData(); + if (CollUtil.isNotEmpty(dataVDtoList) && CollUtil.isNotEmpty(dataHarmDtoList)) { + //计算谐波电压污染值 + dataPollutionD.setValue(PubUtils.doubleRound(2, calcVAllPollutionValue(dataVDtoList, dataHarmDtoList, overlimit) * line.getTimeInterval())); + list.add(dataPollutionD); + } + + dataPollutionD = new DataPollutionD(); + dataPollutionD.setLineId(id); + dataPollutionD.setDataDate(LocalDateTimeUtil.parseDate(calculatedParam.getDataDate())); + dataPollutionD.setPollutionType(iAllLimit); + List data = dataIFeignClient.getGroupByTimeDataI(lineParam).getData(); + if (CollUtil.isNotEmpty(data)) { + //计算谐波电流污染值 + dataPollutionD.setValue(PubUtils.doubleRound(2, calcIAllPollutionValue(data, overlimit) * line.getTimeInterval())); + list.add(dataPollutionD); + } + + } + } + } + } + if (CollUtil.isNotEmpty(list)) { + dataPollutionFeignClient.batchInsertion(list); + } + } + + /** + * 计算谐波电压的污染值，包含了电压总畸变率和谐波电压2~25次 + * + * @param dataVDtoList + * @param dataHarmDtoList + * @param overlimit + * @return + */ + private double calcVAllPollutionValue(List dataVDtoList, List dataHarmDtoList, Overlimit overlimit) { + // 计算时间范围内指标越限百分比 + // 总畸变率的限值 + List thdValueList = dataVDtoList.stream().map(DataVDto::getVThd).collect(Collectors.toList()); + double thdPollutionValue = calcPollutionValue(overlimit.getUbalance(), thdValueList); + //谐波值2~50次 + double harmRateVPollutionValue = calcHarmRateVPollutionValue(overlimit, dataHarmDtoList); + return thdPollutionValue + harmRateVPollutionValue; + } + + private double calcIAllPollutionValue(List dataVDtoList, Overlimit overlimit) { + List pollutionValue = new ArrayList<>(); + // 2次 + for (int i = 2; i < 51; i++) { + Float limitValue = getValueByFieldName(overlimit, "iharm" + i); + int finalI = i; + List valueList = dataVDtoList.stream().map(item -> { + Float valueByFieldName = getValueByFieldName(item, "i" + finalI); + if (Objects.isNull(valueByFieldName)) { + return 0.0; + } else { + return (double) valueByFieldName; + } + }).collect(Collectors.toList()); + pollutionValue.add(calcPollutionValue(limitValue, valueList)); + } + return pollutionValue.stream().mapToDouble(Double::doubleValue).sum(); + } + + /** + * 计算谐波电压2~50的越限污染值 + * + * @param overlimit 限值 + * @param dataHarmRateVList 2~50次的谐波电压值 + * @return 谐波电压污染值 + */ + private double calcHarmRateVPollutionValue(Overlimit overlimit, List dataHarmRateVList) { + List pollutionValue = new ArrayList<>(); + // 2次 + for (int i = 2; i < 51; i++) { + Float limitValue = getValueByFieldName(overlimit, "uharm" + i); + int finalI = i; + List valueList = dataHarmRateVList.stream().map(item -> { + Float valueByFieldName = getValueByFieldName(item, "v" + finalI); + if (Objects.isNull(valueByFieldName)) { + return 0.0; + } else { + return (double) valueByFieldName; + } + }).collect(Collectors.toList()); + pollutionValue.add(calcPollutionValue(limitValue, valueList)); + } + return pollutionValue.stream().mapToDouble(Double::doubleValue).sum(); + } + + /** + * 获取当前组数据的污染值 + * + * @param limit 限值 + * @param valueList 参考数据 + * @return 污染值 + */ + private double calcPollutionValue(Float limit, List valueList) { + double pollutionValue = 0; + // 没有限值的直接返回 + if (Objects.isNull(limit) || limit == 0.0f) { + return pollutionValue; + } + // 计算每个数值的越限百分比MOP + List overLimitPercentList = valueList.stream().map(value -> { + if (Objects.isNull(value)) { + return 0.0; + } + return value * 100 / limit; + }).collect(Collectors.toList()); + // 计算每个越限百分比对应的污染值，并求和返回 + if (CollUtil.isNotEmpty(overLimitPercentList)) { + pollutionValue = overLimitPercentList.stream().map(item -> { + double value = 0; + if (item >= 100.0 && item < 120.0) { + value = 0.1; + } else if (item >= 120.0 && item < 160.0) { + value = 0.2; + } else if (item >= 160.0 && item < 200.0) { + value = 0.3; + } else if (item >= 200.0) { + value = 0.4; + } + return value; + }).mapToDouble(Double::doubleValue).sum(); + } + return pollutionValue; + } + + /** + * 根据标记获取属性对应的值 + * + * @return 值 + */ + public static Float getValueByFieldName(Object obj, String fieldName) { + try { + Field field = obj.getClass().getDeclaredField(fieldName); + field.setAccessible(true); + Object val = field.get(obj); + if (Objects.isNull(val)) { + return null; + } + if (val instanceof Double) { + Double doubleValue = (Double) val; + return doubleValue.floatValue(); + } + return (float) field.get(obj); + } catch (NoSuchFieldException | IllegalAccessException e) { + return 0.0f; + } + } + +} diff --git a/algorithm/algorithm-boot/src/main/resources/bootstrap.yml b/algorithm/algorithm-boot/src/main/resources/bootstrap.yml index 8ff5478..edf5cfe 100644 --- a/algorithm/algorithm-boot/src/main/resources/bootstrap.yml +++ b/algorithm/algorithm-boot/src/main/resources/bootstrap.yml @@ -58,7 +58,7 @@ liteflow: logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: - root: info + root: #mybatis配置信息 diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java index 05e7e03..fb98f60 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataHarmRateVFeignClient.java @@ -40,4 +40,7 @@ public interface DataHarmRateVFeignClient { @PostMapping("/addInfluxDbList") HttpResult addInfluxDbList(@RequestBody List list); + //按时间分组获取原始数据 + @PostMapping("/getGroupByTimeHarmRateV") + HttpResult> getGroupByTimeHarmRateV(@RequestBody LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java index 47ba20c..7db50cb 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataIFeignClient.java @@ -1,18 +1,12 @@ package com.njcn.dataProcess.api; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; import com.njcn.dataProcess.api.fallback.DataIFeignClientFallbackFactory; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -44,4 +38,7 @@ public interface DataIFeignClient { @PostMapping("/addInfluxDbList") HttpResult addInfluxDbList(@RequestBody List dataIList); + + @PostMapping("/getGroupByTimeDataI") + HttpResult> getGroupByTimeDataI(@RequestBody LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java index bcd469f..8ee2391 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java @@ -63,4 +63,9 @@ public interface DataVFeignClient { //获取原始数据 @PostMapping("/getDataV") HttpResult> getDataV(@RequestBody LineCountEvaluateParam lineParam); + + + //按时间分组获取原始数据 + @PostMapping("/getGroupByTimeDataV") + HttpResult> getGroupByTimeDataV(@RequestBody LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java index 5175af4..d7e5a16 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataHarmRateVFeignClientFallbackFactory.java @@ -80,6 +80,12 @@ public class DataHarmRateVFeignClientFallbackFactory implements FallbackFactory< throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> getGroupByTimeHarmRateV(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","dataHarmRateV按时间分组获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataIFeignClientFallbackFactory.java index 2582075..748fe5b 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 @@ -76,6 +76,12 @@ public class DataIFeignClientFallbackFactory implements FallbackFactory> getGroupByTimeDataI(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","dataI按时间分组获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } } diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java index bb6a816..fdf3268 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java @@ -110,6 +110,12 @@ public class DataVFeignClientFallbackFactory implements FallbackFactory> getGroupByTimeDataV(LineCountEvaluateParam lineParam) { + log.error("{}异常，降级处理，异常为：{}","DataV按时间分组获取原始数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java index de6bdf0..fe306f9 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmRateVController.java @@ -10,10 +10,7 @@ import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.annotation.QueryBean; import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; -import com.njcn.dataProcess.pojo.dto.DataHarmDto; -import com.njcn.dataProcess.pojo.dto.DataHarmRateIDto; -import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; +import com.njcn.dataProcess.pojo.dto.*; import com.njcn.dataProcess.service.IDataHarmRateV; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -111,4 +108,12 @@ public class DataHarmRateVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGroupByTimeHarmRateV") + @ApiOperation("按时间分组获取原始数据") + public HttpResult> getGroupByTimeHarmRateV(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getGroupByTimeHarmRateV"); + List dataV = dataHarmRateVQuery.getGroupByTimeHarmRateV(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, 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 5ad9135..f474b00 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 @@ -11,6 +11,7 @@ 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.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.service.IDataI; import com.njcn.web.controller.BaseController; @@ -101,4 +102,12 @@ public class DataIController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataIDtoList, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGroupByTimeDataI") + @ApiOperation("按时间分组获取原始数据") + public HttpResult> getGroupByTimeDataI(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getGroupByTimeDataI"); + List dataV = dataIQuery.getGroupByTimeDataI(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe); + } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java index d1330de..be7bc34 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java @@ -63,7 +63,6 @@ public class DataVController extends BaseController { @ApiOperation("批量插入") public HttpResult batchInsertion(@RequestBody List dataVDTOList) { String methodDescribe = getMethodDescribe("batchInsertion"); - dataVInsert.batchInsertion(dataVDTOList); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -73,7 +72,6 @@ public class DataVController extends BaseController { @ApiOperation("批量插入cvtDto") public HttpResult batchInsertionCvtDTO(@RequestBody List cvtDTOList) { String methodDescribe = getMethodDescribe("batchInsertion"); - dataVInsert.batchInsertionCvtDTO(cvtDTOList); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -83,7 +81,6 @@ public class DataVController extends BaseController { @ApiOperation("获取监测点数据时间点(补招使用)") public HttpResult> monitoringTime(@RequestParam("lineId") String lineId,@RequestParam("localData") String localData) { String methodDescribe = getMethodDescribe("monitoringTime"); - List localDateTimeList = dataVQuery.monitoringTime(lineId,localData); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, localDateTimeList, methodDescribe); } @@ -160,6 +157,18 @@ public class DataVController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGroupByTimeDataV") + @ApiOperation("按时间分组获取原始数据") + public HttpResult> getGroupByTimeDataV(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getGroupByTimeDataV"); + List dataV = dataVQuery.getGroupByTimeDataV(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe); + } + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/memoryTest") @ApiOperation("n内存测试") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java index d6dcfcf..839e581 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmRateV.java @@ -42,4 +42,5 @@ IDataHarmRateV extends IMppService { void addInfluxDbList(List dataVList); + List getGroupByTimeHarmRateV(LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataI.java index 6425897..07b1361 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 @@ -49,4 +49,10 @@ public interface IDataI extends IMppService { */ List getDataI(LineCountEvaluateParam lineParam); + /** + * 分组获取电流信息 + * @param lineParam + * @return + */ + List getGroupByTimeDataI(LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java index 1c5d0c1..3051e80 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java @@ -79,4 +79,6 @@ public interface IDataV extends IMppService { * @Date: 2025/3/20 13:42 */ List getDataV(LineCountEvaluateParam lineParam); + + List getGroupByTimeDataV(LineCountEvaluateParam lineParam); } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java index 45c17c9..2d650cd 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java @@ -4,14 +4,17 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; +import com.njcn.dataProcess.constant.InfluxDBTableConstant; import com.njcn.dataProcess.dao.imapper.DataHarmRateVMapper; import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateVRelationMapper; import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmrateV; +import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; +import com.njcn.dataProcess.pojo.dto.DataVDto; import com.njcn.dataProcess.pojo.po.RStatDataHarmRateVD; import com.njcn.dataProcess.service.IDataHarmRateV; import com.njcn.dataProcess.util.TimeUtils; @@ -206,6 +209,25 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl getGroupByTimeHarmRateV(LineCountEvaluateParam lineParam) { + InfluxQueryWrapper harmRateVQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); + harmRateVQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); + harmRateVQueryWrapper.regular(DataV::getLineId, lineParam.getLineId()) + .eq(DataHarmrateV::getValueType, InfluxDbSqlConstant.CP95) + .ne(DataHarmrateV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + .groupBy("time(" + lineParam.getValueType().get(0) + "m)") + .between(DataHarmrateV::getTime, lineParam.getStartTime(), lineParam.getEndTime()); + List list = dataHarmRateVMapper.selectByQueryWrapper(harmRateVQueryWrapper); + List result = new ArrayList<>(); + list.forEach(item -> { + DataHarmDto dto = new DataHarmDto(); + BeanUtils.copyProperties(item, dto); + result.add(dto); + }); + return result; + } + /** * 按监测点集合、时间条件获取分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 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 71af2f7..64acbae 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 @@ -4,13 +4,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.HarmonicTimesUtil; +import com.njcn.dataProcess.constant.InfluxDBTableConstant; 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.DataHarmrateV; import com.njcn.dataProcess.po.influx.DataI; import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; +import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataID; import com.njcn.dataProcess.service.IDataI; @@ -201,6 +204,25 @@ public class InfluxdbDataIImpl extends MppServiceImpl getGroupByTimeDataI(LineCountEvaluateParam lineParam) { + InfluxQueryWrapper harmRateVQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); + harmRateVQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); + harmRateVQueryWrapper.regular(DataV::getLineId, lineParam.getLineId()) + .eq(DataHarmrateV::getValueType, InfluxDbSqlConstant.CP95) + .ne(DataHarmrateV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + .groupBy("time(" + lineParam.getValueType().get(0) + "m)") + .between(DataHarmrateV::getTime, lineParam.getStartTime(), lineParam.getEndTime()); + List list = dataIMapper.selectByQueryWrapper(harmRateVQueryWrapper); + List result = new ArrayList<>(); + list.forEach(item -> { + DataIDto dto = new DataIDto(); + BeanUtils.copyProperties(item, dto); + result.add(dto); + }); + return result; + } + /** * 按监测点集合、时间条件获取dataI分钟数据 * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java index 3b0f51a..2d45776 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java @@ -382,6 +382,25 @@ public class InfluxdbDataVImpl extends MppServiceImpl getGroupByTimeDataV(LineCountEvaluateParam lineParam) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); + influxQueryWrapper.regular(DataV::getLineId, lineParam.getLineId()) + .eq(DataV::getValueType, InfluxDbSqlConstant.CP95) + .ne(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + .max(DataV::getVThd) + .groupBy("time(" + lineParam.getValueType().get(0) + "m)") + .between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime()); + List list = dataVMapper.selectByQueryWrapper(influxQueryWrapper); + List result = new ArrayList<>(); + list.forEach(item -> { + DataVDto dto = new DataVDto(); + BeanUtils.copyProperties(item, dto); + result.add(dto); + }); + return result; + } + /** * 按监测点集合、时间条件获取dataV分钟数据 * timeMap参数来判断是否进行数据出来 timeMap为空则不进行数据处理 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java index d9dd7a0..c81ebe2 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java @@ -128,6 +128,11 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl getGroupByTimeHarmRateV(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + private List quality(List list, LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmDto::getLineId)); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java index 02cdfd7..41d495a 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 @@ -130,6 +130,11 @@ public class RelationDataIImpl extends MppServiceImpl getGroupByTimeDataI(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + private List quality(List list, LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataIDto::getLineId)); 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 9a2fd96..b010a95 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 @@ -162,6 +162,11 @@ public class RelationDataVImpl extends MppServiceImpl getGroupByTimeDataV(LineCountEvaluateParam lineParam) { + return Collections.emptyList(); + } + private List quality(List list, LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataVDto::getLineId)); diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java index b590c37..69c024f 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java @@ -2,6 +2,7 @@ package com.njcn.migration.read.controller; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.api.MigrationInsertFeignClient; import com.njcn.param.LineCountEvaluateParam; import com.njcn.migration.read.service.MigrationService; import io.swagger.annotations.*; @@ -32,7 +33,7 @@ import java.time.temporal.ChronoUnit; public class MigrationInfluxDBController { private final MigrationService migrationService; - + private final MigrationInsertFeignClient migrationInsertFeignClient; @GetMapping("/influxdb") @ApiOperation("influxdb数据同步->天数按小时进行分组同步") @@ -68,29 +69,32 @@ public class MigrationInfluxDBController { } @GetMapping(value = "/importExcel") @ApiOperation(value ="是否更新数据（1是 0否表示用于定时任务）") - public void importDistributionAreaExcel(@RequestParam("type") Integer type) { + public void importDistributionAreaExcel(@RequestParam("type") Integer type,@RequestParam("startDate") String startDateTime,@RequestParam("endDate") String endDateTime) { if(type==0){ migrationService.initializeExcel(); }else{ - System.out.println("--------------------------------手动1influxdb同步------------------------------------"); - // 获取当前时间 - LocalDateTime now = LocalDateTime.now(); - // 减去2个小时 - LocalDateTime oneHourAgo = now.minusHours(2); - // 将分钟和秒设置为0 - LocalDateTime result = oneHourAgo.truncatedTo(ChronoUnit.HOURS); - // 加上59分钟59秒 - LocalDateTime modifiedResult = result.plusMinutes(59).plusSeconds(59); - - LineCountEvaluateParam param = new LineCountEvaluateParam(); - param.setIsManual(false); - param.setStartTime(result.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); - param.setEndTime(modifiedResult.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); - migrationService.hourseLineDataBacthSysc(param); - migrationService.hourseDevDataBacthSysc(param); + try { + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN); + LineCountEvaluateParam param=new LineCountEvaluateParam(); + param.setIsManual(true); + LocalDateTime startDate = LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATETIME_PATTERN); + LocalDateTime endDate = LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATETIME_PATTERN); + long betweenDay = LocalDateTimeUtil.between(startDate, endDate, ChronoUnit.HOURS); + param.setStartTime(startDate.format(dateTimeFormatter)); + param.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter)); + migrationService.hourseLineEventBacthSysc(param); + for (int i = 0; i