删除校验
This commit is contained in:
@@ -611,81 +611,81 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
|
||||
List<CarryCapcityData> dataHarmPowerq2List = excelDataDTO.getDataHarmPowerQ2List();
|
||||
List<CarryCapcityData> 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<CarryCapcityData> 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<CarryCapcityData> 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",
|
||||
|
||||
Reference in New Issue
Block a user