Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改bug

Browse Source
This commit is contained in:
hzj
2024-12-12 13:39:22 +08:00
parent 5125ef738a
commit 78524de495
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java
View File

@@ -629,7 +629,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//数据校验 //数据校验
if (CollectionUtil.isEmpty(dataHarmPowerpList)) { if (CollectionUtil.isEmpty(dataHarmPowerpList)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
if (checkData(dataHarmPowerpList, startDate, endDate, timeInterval)) { if (checkData(dataHarmPowerpList, startDate, endDate, timeInterval)) {
@@ -641,7 +641,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//数据校验 //数据校验
if (CollectionUtil.isEmpty(dataHarmPowerp2List)) { if (CollectionUtil.isEmpty(dataHarmPowerp2List)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
if (checkData(dataHarmPowerp2List, startDate2, endDate2, timeInterval)) { if (checkData(dataHarmPowerp2List, startDate2, endDate2, timeInterval)) {
@@ -653,7 +653,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//数据校验 //数据校验
if (CollectionUtil.isEmpty(dataHarmPowerqList)) { if (CollectionUtil.isEmpty(dataHarmPowerqList)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
if (checkData(dataHarmPowerqList, startDate, endDate, timeInterval)) { if (checkData(dataHarmPowerqList, startDate, endDate, timeInterval)) {
@@ -665,7 +665,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//数据校验 //数据校验
if (CollectionUtil.isEmpty(dataHarmPowerq2List)) { if (CollectionUtil.isEmpty(dataHarmPowerq2List)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
if (checkData(dataHarmPowerq2List, startDate2, endDate2, timeInterval)) { if (checkData(dataHarmPowerq2List, startDate2, endDate2, timeInterval)) {
@@ -677,7 +677,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
//数据校验 //数据校验
if (CollectionUtil.isEmpty(dataHarmPoweruList)) { if (CollectionUtil.isEmpty(dataHarmPoweruList)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
if (checkData(dataHarmPoweruList, startDate2, endDate2, timeInterval)) { if (checkData(dataHarmPoweruList, startDate2, endDate2, timeInterval)) {
@@ -688,7 +688,7 @@ public class CarryCapacityServiceImpl implements CarryCapacityService {
linearInterpolation(dataHarmPoweruList); linearInterpolation(dataHarmPoweruList);
if (CollectionUtil.isEmpty(dataiList)) { if (CollectionUtil.isEmpty(dataiList)) {
throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周上周是否充足"); throw new BusinessException("数据量过少，请查看上传数据集的数据集时间与页面选择时间"+startDate+"-"+endDate+"的本周数据及其上周是否充足");
} else { } else {
List<CarryCapcityData> iList = dataiList.stream().map(temp -> { List<CarryCapcityData> iList = dataiList.stream().map(temp -> {
CarryCapcityData carryCapcityData = new CarryCapcityData(); CarryCapcityData carryCapcityData = new CarryCapcityData();