From 95b9bef76ed8b62c3852cedc8a64b00b8ba42f48 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Tue, 24 Jun 2025 11:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E8=BD=BD=E8=83=BD=E5=8A=9B=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CarryCapacityServiceImpl.java           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 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<String, Double[]> stringMap = caluParam(dataHarmPowerP2List, dataHarmPowerQ2List, dataHarmPowerU2List);
+            carryCapacityDataVO.setStringMap(stringMap);
+            return carryCapacityDataVO;
+        }catch (Exception e){
+            return carryCapacityDataVO;
+        }
 
-        //用前2周的数据计算C,a,b
-        Map<String, Double[]> 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();