[update] 城市大脑-干线方案分析返回零值

signal-optimize-service/src/main/java/net/wanji/opt/bo/MainlineSchemeEvaluateBO.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "MainlineSchemeEvaluateBO", description = "干线方案评价")
 public class MainlineSchemeEvaluateBO {
-    @ApiModelProperty(value = "方案名称")
+    @ApiModelProperty(value = "绿波名称")
     private String greenwaveName;
 
     @ApiModelProperty(value = "方向名称")

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -763,6 +763,11 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
             // 根据时段查询所有发生的绿波
             List<GreenwaveHistPO> greenwaveHistPOList = greenwaveHistMapper
                     .selectByTimeSection(boStartTimeStr, boEndTimeStr);
+
+            if (CollectionUtil.isEmpty(greenwaveHistPOList)) {
+                return emptyResMainlineSchemeAnalysis();
+            }
+
             // 根据干线名称筛选结果
             List<GreenwaveHistPO> filteredList = greenwaveHistPOList.stream()
                     .filter(po -> {
@@ -796,6 +801,39 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         return res;
     }
 
+    private MainlineSchemeAnalysisVO emptyResMainlineSchemeAnalysis() {
+        MainlineSchemeAnalysisVO res = new MainlineSchemeAnalysisVO();
+
+        List<MainlineSchemeAnalysisVO.DirectionData> sceneData = new ArrayList<>();
+        MainlineSchemeAnalysisVO.DirectionData directionData = new MainlineSchemeAnalysisVO.DirectionData();
+        directionData.setName("");
+        directionData.setTimes(0);
+        sceneData.add(directionData);
+        res.setSceneData(sceneData);
+
+        List<MainlineSchemeAnalysisVO.CrossData> crossData= new ArrayList<>();
+        MainlineSchemeAnalysisVO.CrossData crossDataElement = new MainlineSchemeAnalysisVO.CrossData();
+        crossDataElement.setName("");
+        crossDataElement.setTimes(0);
+        crossData.add(crossDataElement);
+        res.setCrossData(crossData);
+
+        List<String> evaluateData = new ArrayList<>();
+        evaluateData.add("符合控制策略方案数 0个");
+        evaluateData.add("不符合控制策略方案数 0个");
+        res.setEvaluateData(evaluateData);
+
+        List<MainlineSchemeAnalysisVO.GreenwaveData> greenwaveData = new ArrayList<>();
+        MainlineSchemeAnalysisVO.GreenwaveData greenwaveDataElement = new MainlineSchemeAnalysisVO.GreenwaveData();
+        greenwaveDataElement.setName("");
+        greenwaveDataElement.setGreenwaveId(0);
+        greenwaveDataElement.setDirList(new ArrayList<>());
+        greenwaveData.add(greenwaveDataElement);
+        res.setGreenwaveData(greenwaveData);
+
+        return res;
+    }
+
     private void fillLineSchemeBuffer(List<GreenwaveHistPO> filteredList, Map<String, LineSchemeDTO> lineSchemeBuffer)
             throws Exception {
 
@@ -919,6 +957,11 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     @Override
     public MainlineSchemeEvaluateVO mainlineSchemeEvaluate(MainlineSchemeEvaluateBO bo) {
         String greenwaveName = bo.getGreenwaveName();
+
+        if (ObjectUtil.isEmpty(greenwaveName)) {
+            return buildEmptyRes();
+        }
+
         LineSchemeDTO lineSchemeDTO = lineSchemeBuffer.get(greenwaveName);
         Integer greenwaveId = lineSchemeDTO.getGreenwaveId();
         String dirName = bo.getDirName();
@@ -950,6 +993,16 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         return res;
     }
 
+    private MainlineSchemeEvaluateVO buildEmptyRes() {
+        MainlineSchemeEvaluateVO res = new MainlineSchemeEvaluateVO();
+        res.setTimeSection("");
+        res.setStrategyName("");
+        res.setGreenwaveCrossList(new ArrayList<>());
+        res.setCurveElementList(new ArrayList<>());
+        res.setEvaluateList(new ArrayList<>());
+        return res;
+    }
+
     @Override
     public List<MainlineCrossEvaluateVO> mainlineCrossEvaluate(MainlineCrossEvaluateBO bo) {
         String greenwaveName = bo.getGreenwaveName();
@@ -1058,8 +1111,20 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         List<GreenwaveHistPO> greenwaveHistPOList =
                 greenwaveHistMapper.selectByIdAndTimeSection(greenwaveId, boStartTimeStr, boEndTimeStr);
 
-        // 找出拥堵时段
         List<MainlineRunningAnalyseVO> congestionList = new ArrayList<>();
+        // 返回零值
+        if (CollectionUtil.isEmpty(greenwaveHistPOList)) {
+            MainlineRunningAnalyseVO vo = new MainlineRunningAnalyseVO();
+            vo.setStatus(3);
+            vo.setTimeSpan("");
+            vo.setDuration(0);
+            vo.setStartTime(null);
+            vo.setEndTime(null);
+            congestionList.add(vo);
+            return congestionList;
+        }
+
+        // 找出拥堵时段
         for (GreenwaveHistPO po : greenwaveHistPOList) {
             if (po.getStatus() == 3) {
                 MainlineRunningAnalyseVO vo = new MainlineRunningAnalyseVO();