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 12ade6846..3e17fb011 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 @@ -290,12 +290,15 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { carryCapacityDataVO.setP_βminMap(results); + try { + //用前2周的数据计算C,a,b + Map stringMap = caluParam(dataHarmPowerP2List, dataHarmPowerQ2List, dataHarmPowerU2List); + carryCapacityDataVO.setStringMap(stringMap); + return carryCapacityDataVO; + }catch (Exception e){ + return carryCapacityDataVO; + } - //用前2周的数据计算C,a,b - Map stringMap = caluParam(dataHarmPowerP2List, dataHarmPowerQ2List, dataHarmPowerU2List); - carryCapacityDataVO.setStringMap(stringMap); - - return carryCapacityDataVO; } @Override @@ -459,6 +462,9 @@ public class CarryCapacityServiceImpl implements CarryCapacityService { @Transactional(rollbackFor = Exception.class) public CarryCapacityDResultVO carryCapacityCal(CarryCapacityCalParam calParam) { CarryCapacityDResultVO carryCapacitydResultVO = new CarryCapacityDResultVO(); + if(CollectionUtil.isEmpty(calParam.getStringMap())){ + throw new BusinessException("数据有误,模型训练失败"); + } String scale = calParam.getScale(); String scaleValue = dicDataFeignClient.getDicDataById(scale).getData().getValue();