[update] 干线评价，增加排队长度指标

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

@@ -1019,6 +1019,12 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                     .average()
                     .orElse(0.0);
             dirValue = (int) Math.round(average);
+        } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription())) {
+            double max = crossDirDataHistPOList.stream()
+                    .mapToDouble(CrossDirDataHistPO::getQueueLength)
+                    .max()
+                    .orElse(0.0);
+            dirValue = (int) Math.round(max);
         }
         return dirValue;
     }
@@ -1349,6 +1355,26 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
 
                     int value = (int) sumOfAverages;
 
+                    curveElement.setValue(value);
+                    curveElementList.add(curveElement);
+                }
+            } else if (Objects.equals(metricName, StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription())) {
+                for (String hourMinute : timeArray) {
+                    MainlineSchemeEvaluateVO.CurveElement curveElement = new MainlineSchemeEvaluateVO.CurveElement();
+                    curveElement.setMetricTime(hourMinute);
+
+                    List<CrossDirDataHistPO> crossDirDataHistPOList = groupedByTime.get(hourMinute);
+                    double sumOfMax = crossDirDataHistPOList.stream()
+                            .collect(Collectors.groupingBy(CrossDirDataHistPO::getCrossId))
+                            .entrySet().stream()
+                            .mapToDouble(entry -> entry.getValue().stream()
+                                    .mapToDouble(CrossDirDataHistPO::getQueueLength)
+                                    .max()
+                                    .orElse(0.0))
+                            .max().orElse(0.0);
+
+                    int value = (int) sumOfMax;
+
                     curveElement.setValue(value);
                     curveElementList.add(curveElement);
                 }
@@ -1640,6 +1666,11 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
             metric.setIsShown(0);
             res.add(metric);
 
+            MainlineSchemeAnalysisVO.Metric metric2 = new MainlineSchemeAnalysisVO.Metric();
+            metric2.setMetricName(StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription());
+            metric2.setIsShown(1);
+            res.add(metric2);
+
             MainlineSchemeAnalysisVO.Metric metric1 = new MainlineSchemeAnalysisVO.Metric();
             metric1.setMetricName(StrategyAndMetricsEnum.Metrics.UNCOORDINATE_PHASE_QUEUE.getDescription());
             metric1.setIsShown(0);
@@ -1658,6 +1689,11 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         metric2.setIsShown(0);
         res.add(metric2);
 
+        MainlineSchemeAnalysisVO.Metric metric8 = new MainlineSchemeAnalysisVO.Metric();
+        metric8.setMetricName(StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription());
+        metric8.setIsShown(1);
+        res.add(metric8);
+
         MainlineSchemeAnalysisVO.Metric metric3 = new MainlineSchemeAnalysisVO.Metric();
         metric3.setMetricName(StrategyAndMetricsEnum.Metrics.GREEN_LIGHT_EFFICIENCY.getDescription());
         metric3.setIsShown(1);
@@ -1693,10 +1729,6 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
             List<GreenwaveHistPO> filteredList, Map<String, LineSchemeDTO> lineSchemeBuffer, int boStartTimeStamp,
             int boEndTimeStamp, Date boStartTime, Date boEndTime) {
 
-        List<CrossDataHistPO> baseCrossDataHistPOList = crossDataHistMapper.selectByStartEnd(boStartTimeStamp, boEndTimeStamp);
-        List<GreenwaveCrossPO> baseGreenwaveCrossPOList = greenwaveCrossMapper.selectAll();
-        List<BaseCrossInfoPO> baseCrossInfoPOList = baseCrossInfoMapper.selectAll();
-
         Set<String> qualifiedSet = new HashSet<>();
         Set<String> notQualifiedSet = new HashSet<>();