方案评价追加trycatch

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/evaluation/impl/EvaluationInfoServiceImpl.java

@@ -3,6 +3,7 @@ package net.wanji.opt.servicev2.evaluation.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import net.wanji.databus.dao.mapper.CrossDataHistMapper;
 import net.wanji.databus.po.CrossDataHistPO;
 import net.wanji.opt.constant.ServiceLevelEnum;
@@ -19,6 +20,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service
+@Slf4j
 public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper, CrossDataHistPO> implements EvaluationInfoService {
 
     @Autowired
@@ -28,45 +30,47 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
 
     @Override
     public Map<String,Object> getListEvaluationSummarize(String crossId, String startTime, String endTime, String contrastStartTime, String constrastEndTime) {
+
+      try {
           //分析时间的数据
-        List<CrossDataHistPO> analyseList= crossDataHistMapper.getListEvaluationanalyse(crossId,startTime,endTime);
+          List<CrossDataHistPO> analyseList = crossDataHistMapper.getListEvaluationanalyse(crossId, startTime, endTime);
 
           //比较时间的数据
-        List<CrossDataHistPO> contrastList= crossDataHistMapper.getListEvaluationcontrast(crossId,contrastStartTime,constrastEndTime);
+          List<CrossDataHistPO> contrastList = crossDataHistMapper.getListEvaluationcontrast(crossId, contrastStartTime, constrastEndTime);
           //分析时间服务水平
-        List<CrossDataHistPO> ServiceLevelanalyseList= crossDataHistMapper.getEvaluationanalyseServiceLevel(crossId,startTime,endTime);
+         // List<CrossDataHistPO> ServiceLevelanalyseList = crossDataHistMapper.getEvaluationanalyseServiceLevel(crossId, startTime, endTime);
 
           //比较时间的服务水平
-        List<CrossDataHistPO> contrastServiceLevelList= crossDataHistMapper.getServiceLevelEvaluationcontrast(crossId,contrastStartTime,constrastEndTime);
+        //  List<CrossDataHistPO> contrastServiceLevelList = crossDataHistMapper.getServiceLevelEvaluationcontrast(crossId, contrastStartTime, constrastEndTime);
           //取出分析时间 的速度 延误 排队长度
-           Double speed=0.00;
-           Integer delayTime =0;
-           Double queueLength=0.00;
+          Double speed = 0.00;
+          Integer delayTime = 0;
+          Double queueLength = 0.00;
           //分析的交通流量
-           int analyseFlow=0;
-         for (CrossDataHistPO analyselist:analyseList){
+          int analyseFlow = 0;
+          for (CrossDataHistPO analyselist : analyseList) {
               if (analyselist == null) {
                   continue; // 跳过空元素
               }
               speed = analyselist.getSpeed();
               delayTime = analyselist.getDelayTime();
               queueLength = analyselist.getQueueLength();
-              analyseFlow= analyselist.getFlow();
+              analyseFlow = analyselist.getFlow();
           }
           //取出对比时间 的速度 延误 排队长度
-        Double speedCompare=0.00;
-        Integer delayTimeCompare =0;
-        Double queueLengthCompare=0.00;
+          Double speedCompare = 0.00;
+          Integer delayTimeCompare = 0;
+          Double queueLengthCompare = 0.00;
           //对比的交通流量
-        int contrastFlow=0;
-        for (CrossDataHistPO contrastlist:contrastList){
+          int contrastFlow = 0;
+          for (CrossDataHistPO contrastlist : contrastList) {
               if (contrastlist == null) {
                   continue; // 跳过空元素
               }
               speedCompare = contrastlist.getSpeed();
               delayTimeCompare = contrastlist.getDelayTime();
               queueLengthCompare = contrastlist.getQueueLength();
-            contrastFlow= contrastlist.getFlow();
+              contrastFlow = contrastlist.getFlow();
           }
 
           // 计算速度变化百分比
@@ -79,20 +83,28 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
           double queueLengthChangePercent = calculatePercentage(queueLength, queueLengthCompare);
 
           // 计算交通流量百分比
-        double flow= calculatePercentage(analyseFlow, contrastFlow);
+          double flow = calculatePercentage(analyseFlow, contrastFlow);
           //取出分析时间的服务水平
-        String analyseserviceLevel = getServiceLevel(ServiceLevelanalyseList);
+//          String analyseserviceLevel = getServiceLevel(ServiceLevelanalyseList);
           //取出对比时间的服务水平
-        String compareServiceLevel = getServiceLevel(contrastServiceLevelList);
+//          String compareServiceLevel = getServiceLevel(contrastServiceLevelList);
           JSONObject jsonObject = new JSONObject();
-        jsonObject.put("speed", speedChangePercent+"%");
-        jsonObject.put("delay",delayTimeChangePercent+"%");
-        jsonObject.put("queueLength",queueLengthChangePercent+"%");
-        jsonObject.put("flow",flow+"%");
-        jsonObject.put("analyseserviceLevel",analyseserviceLevel);
-        jsonObject.put("compareServiceLevel",compareServiceLevel);
+          //平均速度
+          jsonObject.put("speed", speedChangePercent + "%");
+          //平均延误
+          jsonObject.put("delay", delayTimeChangePercent + "%");
+          //平均排队时长
+          jsonObject.put("queueLength", queueLengthChangePercent + "%");
+          // 计算交通流量百分比
+          jsonObject.put("flow", flow + "%");
+//          jsonObject.put("analyseserviceLevel", analyseserviceLevel);
+//          jsonObject.put("compareServiceLevel", compareServiceLevel);
 
           return jsonObject;
+      }catch (Exception e){
+          log.error("{} getListEvaluationSummarize error", this.getClass().getSimpleName(), e);
+          throw  e;
+      }
     }
     /**
      * 计算变化百分比
@@ -134,6 +146,7 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
     @Override
     public Map<String, Object> summaryEvaluation(String crossId, String startTime, String endTime, String contrastStartTime, String constrastEndTime) {
 
+         try {
 
              //分析时间
              List<TEventOptimizeInfo> overFlowList = crossProblemEvaluationMapper.getOverflow(crossId, startTime, endTime);
@@ -199,14 +212,19 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
              //对比的溢出优化次数
              jsonObject.put("contrastOverFlowOptimize", contrastoverFlowTime);
              //溢出次数分析对比计算
-            jsonObject.put("OverFlowTimeCalculate", overFlowCishujisuan+ "%");
+             jsonObject.put("OverFlowTimeCalculate", overFlowCishujisuan + "%");
              //溢出时长分析对比计算
-            jsonObject.put("OverFlowHourCalculate", overFlowtimejisuan+ "%");
+             jsonObject.put("OverFlowHourCalculate", overFlowtimejisuan + "%");
              //溢出平均延误
-            jsonObject.put("OverFlowavgdelay", overFlowDelayjisuan+ "%");
+             jsonObject.put("OverFlowavgdelay", overFlowDelayjisuan + "%");
 
              return jsonObject;
          }
+         catch (Exception e){
+             log.error("{} summaryEvaluation error", this.getClass().getSimpleName(), e);
+             throw  e;
+         }
+    }
 
 
       /*失衡702
@@ -214,6 +232,7 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
       * */
     @Override
     public Map<String, Object> unbalanceEvaluation(String crossId, String startTime, String endTime, String contrastStartTime, String constrastEndTime) {
+        try {
 
             //分析时间
             List<TEventOptimizeInfo> overFlowList = crossProblemEvaluationMapper.getOverflow(crossId, startTime, endTime);
@@ -279,13 +298,17 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
             //对比的失衡的优化次数
             jsonObject.put("contrastunbalanceTime", contrastunbalanceTime);
             //失衡次数分析对比计算
-        jsonObject.put("unbalanceCishucalculate", unbalanceCishujisuan+ "%");
+            jsonObject.put("unbalanceCishucalculate", unbalanceCishujisuan + "%");
             //失衡时长分析对比计算
-        jsonObject.put("unbalancetimecalculate", unbalancetimejisuan+ "%");
+            jsonObject.put("unbalancetimecalculate", unbalancetimejisuan + "%");
             //失衡平均停车次数
-        jsonObject.put("unbalanceStopTimescalculate", unbalanceStopTimesjisuan+ "%");
+            jsonObject.put("unbalanceStopTimescalculate", unbalanceStopTimesjisuan + "%");
 
             return jsonObject;
+        }catch (Exception e){
+            log.error("{} unbalanceEvaluation error", this.getClass().getSimpleName(), e);
+            throw  e;
+        }
     }
 
    /*
@@ -294,6 +317,8 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
     @Override
     public Map<String, Object> idleEvaluation(String crossId, String startTime, String endTime, String contrastStartTime, String constrastEndTime) {
 
+        try {
+
             //分析时间
             List<TEventOptimizeInfo> overFlowList = crossProblemEvaluationMapper.getOverflow(crossId, startTime, endTime);
 
@@ -310,7 +335,6 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
             long dileTime = overFlowList.stream().filter(event -> "701".equals(event.getEventType()) && "1".equals(event.getOptStatus())).count();
 
             //对比时间空放优化次数
-
             long contrastDileTime = contrastoverFlowList.stream().filter(event -> "701".equals(event.getEventType()) && "1".equals(event.getOptStatus())).count();
 
             //分析空放时长
@@ -360,14 +384,17 @@ public class EvaluationInfoServiceImpl extends ServiceImpl<CrossDataHistMapper,
             //对比的空放的优化次数
             jsonObject.put("contrastDileTime", contrastDileTime);
             //空放次数分析对比计算
-        jsonObject.put("dileCishucalculate", dileCishujisuan+ "%");
+            jsonObject.put("dileCishucalculate", dileCishujisuan + "%");
             //空放时长分析对比计算
-        jsonObject.put("dileTimecalculate", dileTimejisuan+ "%");
+            jsonObject.put("dileTimecalculate", dileTimejisuan + "%");
             //空放评价速度对比计算
-        jsonObject.put("dileSpeedcalculate", dileSpeedjisuan+ "%");
+            jsonObject.put("dileSpeedcalculate", dileSpeedjisuan + "%");
 
             return jsonObject;
-
+        }catch (Exception e){
+            log.error("{} idleEvaluation error", this.getClass().getSimpleName(), e);
+            throw  e;
+        }
 
     }
 }