[update] 运行评价-干线方案评价下拉菜单

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

@@ -1695,7 +1695,7 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                 addMetrics(res);
                 MainlineSchemeAnalysisVO.Metric metric = new MainlineSchemeAnalysisVO.Metric();
                 metric.setMetricName(StrategyAndMetricsEnum.Metrics.UNCOORDINATE_PHASE_QUEUE.getDescription());
-                metric.setIsShown(0);
+                metric.setIsShownRight(0);
                 res.add(metric);
             } else {
                 fillBalanceMetrics(res, strategyCode);
@@ -1713,17 +1713,17 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         if (Objects.equals(strategyCode, StrategyAndMetricsEnum.Strategy.LINE_BALANCE.getCode())) {
             MainlineSchemeAnalysisVO.Metric metric2 = new MainlineSchemeAnalysisVO.Metric();
             metric2.setMetricName(StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription());
-            metric2.setIsShown(1);
+            metric2.setIsShownRight(1);
             res.add(metric2);
 
             MainlineSchemeAnalysisVO.Metric metric = new MainlineSchemeAnalysisVO.Metric();
             metric.setMetricName(StrategyAndMetricsEnum.Metrics.CORD_QUEUE_RATIO.getDescription());
-            metric.setIsShown(0);
+            metric.setIsShownRight(0);
             res.add(metric);
 
             MainlineSchemeAnalysisVO.Metric metric1 = new MainlineSchemeAnalysisVO.Metric();
             metric1.setMetricName(StrategyAndMetricsEnum.Metrics.UNCOORDINATE_PHASE_QUEUE.getDescription());
-            metric1.setIsShown(0);
+            metric1.setIsShownRight(0);
             res.add(metric1);
         }
     }
@@ -1731,48 +1731,60 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
     private void addMetrics(List<MainlineSchemeAnalysisVO.Metric> res) {
         MainlineSchemeAnalysisVO.Metric metric = new MainlineSchemeAnalysisVO.Metric();
         metric.setMetricName(StrategyAndMetricsEnum.Metrics.NO_PARK_PASS_RATE.getDescription());
-        metric.setIsShown(0);
+        metric.setIsShownRight(0);
         res.add(metric);
 
         MainlineSchemeAnalysisVO.Metric metric2 = new MainlineSchemeAnalysisVO.Metric();
         metric2.setMetricName(StrategyAndMetricsEnum.Metrics.TRVAL_TIME.getDescription());
-        metric2.setIsShown(0);
+        metric2.setIsShownRight(0);
         res.add(metric2);
 
         MainlineSchemeAnalysisVO.Metric metric8 = new MainlineSchemeAnalysisVO.Metric();
         metric8.setMetricName(StrategyAndMetricsEnum.Metrics.MAX_QUEUE_LENGTH.getDescription());
-        metric8.setIsShown(1);
+        metric8.setIsShownRight(1);
         res.add(metric8);
 
         MainlineSchemeAnalysisVO.Metric metric3 = new MainlineSchemeAnalysisVO.Metric();
         metric3.setMetricName(StrategyAndMetricsEnum.Metrics.GREEN_LIGHT_EFFICIENCY.getDescription());
-        metric3.setIsShown(1);
+        metric3.setIsShownRight(1);
         res.add(metric3);
 
         MainlineSchemeAnalysisVO.Metric metric4 = new MainlineSchemeAnalysisVO.Metric();
         metric4.setMetricName(StrategyAndMetricsEnum.Metrics.STOP_TIMES.getDescription());
-        metric4.setIsShown(1);
+        metric4.setIsShownRight(1);
         res.add(metric4);
 
         MainlineSchemeAnalysisVO.Metric metric5 = new MainlineSchemeAnalysisVO.Metric();
         metric5.setMetricName(StrategyAndMetricsEnum.Metrics.AVERAGE_DELAY.getDescription());
-        metric5.setIsShown(1);
+        metric5.setIsShownRight(1);
         res.add(metric5);
 
         MainlineSchemeAnalysisVO.Metric metric6 = new MainlineSchemeAnalysisVO.Metric();
         metric6.setMetricName(StrategyAndMetricsEnum.Metrics.AVERAGE_SPEED.getDescription());
-        metric6.setIsShown(1);
+        metric6.setIsShownRight(1);
         res.add(metric6);
 
         MainlineSchemeAnalysisVO.Metric metric7 = new MainlineSchemeAnalysisVO.Metric();
         metric7.setMetricName(StrategyAndMetricsEnum.Metrics.CORD_RELIABILITY.getDescription());
-        metric7.setIsShown(0);
+        metric7.setIsShownRight(0);
         res.add(metric7);
 
         MainlineSchemeAnalysisVO.Metric metric9 = new MainlineSchemeAnalysisVO.Metric();
         metric9.setMetricName(StrategyAndMetricsEnum.Metrics.TRAFFIC_INDEX.getDescription());
-        metric9.setIsShown(0);
+        metric9.setIsShownRight(0);
         res.add(metric9);
+
+        MainlineSchemeAnalysisVO.Metric metric10 = new MainlineSchemeAnalysisVO.Metric();
+        metric10.setMetricName(StrategyAndMetricsEnum.Metrics.EMPTY_PHASE.getDescription());
+        metric10.setIsShownRight(1);
+        metric10.setIsShownLeft(0);
+        res.add(metric10);
+
+        MainlineSchemeAnalysisVO.Metric metric11 = new MainlineSchemeAnalysisVO.Metric();
+        metric11.setMetricName(StrategyAndMetricsEnum.Metrics.EFFUSION_RATE.getDescription());
+        metric11.setIsShownRight(1);
+        metric11.setIsShownLeft(0);
+        res.add(metric11);
     }
 
     private String reverseDirName(String input, String character) {

signal-optimize-service/src/main/java/net/wanji/opt/vo/MainlineSchemeAnalysisVO.java

@@ -72,6 +72,9 @@ public class MainlineSchemeAnalysisVO {
         private String metricName;
 
         @ApiModelProperty(value = "是否在干线路口评价下拉列表和底部曲线图下拉列表展示，0否 1是")
-        private Integer isShown;
+        private Integer isShownRight;
+
+        @ApiModelProperty(value = "是否在干线方案评价下拉列表展示，0否 1是")
+        private Integer isShownLeft = 1;
     }
 }

wj-common/src/main/java/net/wanji/common/enums/StrategyAndMetricsEnum.java

@@ -52,7 +52,8 @@ public class StrategyAndMetricsEnum {
         CORD_QUEUE_RATIO("16", "协调路段排队空间占比", "%", "cordQueueRatio"),
         UNCOORDINATE_PHASE_QUEUE("17", "非协调相位二次排队", "%", "uncoordinatePhaseQueue"),
         TRVAL_TIME("18", "干线行程时间", "s", "trvalTime"),
-        TRAFFIC_INDEX("19", "拥堵指数", "", "trafficIndex");
+        TRAFFIC_INDEX("19", "拥堵指数", "", "trafficIndex"),
+        EMPTY_PHASE("20", "绿灯空放时长", "m", "emptyPhase");
 
         private final String code;
         private final String description;
@@ -124,7 +125,9 @@ public class StrategyAndMetricsEnum {
                 Metrics.MAX_QUEUE_LENGTH,
                 Metrics.STOP_TIMES,
                 Metrics.AVERAGE_SPEED,
-                Metrics.TRAFFIC_INDEX
+                Metrics.TRAFFIC_INDEX,
+                Metrics.EMPTY_PHASE,
+                Metrics.EFFUSION_RATE
         ));
         map.put(Strategy.BALANCE, Arrays.asList(
                 Metrics.GREEN_LIGHT_EFFICIENCY,