From 3f56fa0de95e70a2e4d74ee2767b18798e85d15d Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 5 Dec 2024 15:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CarryCapacityServiceImpl.java | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java index 8c608b3b4..e00a06f59 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java @@ -611,81 +611,81 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { List dataHarmPowerq2List = excelDataDTO.getDataHarmPowerQ2List(); List dataHarmPoweruList = excelDataDTO.getDataHarmPowerU2List(); - //数据校验 - if (CollectionUtil.isEmpty(dataHarmPowerpList)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - - if (checkData(dataHarmPowerpList, startDate, endDate, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolation(dataHarmPowerpList); - - //数据校验 - if (CollectionUtil.isEmpty(dataHarmPowerp2List)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - - if (checkData(dataHarmPowerp2List, startDate2, endDate2, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolation(dataHarmPowerp2List); - - //数据校验 - if (CollectionUtil.isEmpty(dataHarmPowerqList)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - - if (checkData(dataHarmPowerqList, startDate, endDate, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolation(dataHarmPowerqList); - - //数据校验 - if (CollectionUtil.isEmpty(dataHarmPowerq2List)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - - if (checkData(dataHarmPowerq2List, startDate2, endDate2, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolation(dataHarmPowerq2List); - - //数据校验 - if (CollectionUtil.isEmpty(dataHarmPoweruList)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - - if (checkData(dataHarmPoweruList, startDate2, endDate2, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolation(dataHarmPoweruList); - - if (CollectionUtil.isEmpty(dataiList)) { - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } else { - List iList = dataiList.stream().map(temp -> { - CarryCapcityData carryCapcityData = new CarryCapcityData(); - BeanUtils.copyProperties(temp, carryCapcityData); - carryCapcityData.setValue(temp.getI2()); - return carryCapcityData; - }).collect(Collectors.toList()); - if (checkData(iList, startDate, endDate, timeInterval)) { - - throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); - } - } - linearInterpolationI(dataiList); +// //数据校验 +// if (CollectionUtil.isEmpty(dataHarmPowerpList)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// +// if (checkData(dataHarmPowerpList, startDate, endDate, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolation(dataHarmPowerpList); +// +// //数据校验 +// if (CollectionUtil.isEmpty(dataHarmPowerp2List)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// +// if (checkData(dataHarmPowerp2List, startDate2, endDate2, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolation(dataHarmPowerp2List); +// +// //数据校验 +// if (CollectionUtil.isEmpty(dataHarmPowerqList)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// +// if (checkData(dataHarmPowerqList, startDate, endDate, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolation(dataHarmPowerqList); +// +// //数据校验 +// if (CollectionUtil.isEmpty(dataHarmPowerq2List)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// +// if (checkData(dataHarmPowerq2List, startDate2, endDate2, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolation(dataHarmPowerq2List); +// +// //数据校验 +// if (CollectionUtil.isEmpty(dataHarmPoweruList)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// +// if (checkData(dataHarmPoweruList, startDate2, endDate2, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolation(dataHarmPoweruList); +// +// if (CollectionUtil.isEmpty(dataiList)) { +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } else { +// List iList = dataiList.stream().map(temp -> { +// CarryCapcityData carryCapcityData = new CarryCapcityData(); +// BeanUtils.copyProperties(temp, carryCapcityData); +// carryCapcityData.setValue(temp.getI2()); +// return carryCapcityData; +// }).collect(Collectors.toList()); +// if (checkData(iList, startDate, endDate, timeInterval)) { +// +// throw new BusinessException(AdvanceResponseEnum.DATA_NOT_FOUND); +// } +// } +// linearInterpolationI(dataiList); // 存入redis redisUtil.saveByKey(lineId + "#" + LocalDateTimeUtil.format(startDate, formatter) + "#" + LocalDateTimeUtil.format(endDate, formatter) + "#" + "P",