Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/common/enums/StrategyControlEnum.java

@@ -10,13 +10,16 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum StrategyControlEnum {
-    ZERO(0, "绿波带"),
-    ONE(1, "失衡"),
-    TWO(2, "溢出"),
-    THREE(3, "空放");
+    ZERO(0, "绿波带", "效率提升"),
+    ONE(1, "失衡", "均衡调控"),
+    TWO(2, "溢出", "效率提升"),
+    THREE(3, "空放", "效率提升"),
+    FOUR(4, "拥堵", "效率提升"),
+    FIVE(5, "畅通", "畅通");
 
     private int code;
     private String desc;
+    private String method;
 
     public static String getDesc(int code) {
         for (StrategyControlEnum value : StrategyControlEnum.values()) {
@@ -24,6 +27,15 @@ public enum StrategyControlEnum {
                 return value.getDesc();
             }
         }
+        return StrategyControlEnum.FIVE.getDesc();
+    }
+
+    public static String getMethod(int code) {
+        for (StrategyControlEnum value : StrategyControlEnum.values()) {
+            if (code == value.getCode()) {
+                return value.getMethod();
+            }
+        }
         return "";
     }
 }

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/controller/StrategyControlController.java

@@ -88,7 +88,7 @@ public class StrategyControlController {
         return strategyControlService.strategyOptTimes();
     }
 
-    @ApiOperation(value = "路网优化监测-接口干线列表", notes = "路网优化监测-AI路口-AI干线",
+    @ApiOperation(value = "路网优化监测-路口干线列表", notes = "路网优化监测-AI路口-AI干线",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @GetMapping(value = "/crossOptInfoList")

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyControlDataExt.java

@@ -10,4 +10,5 @@ import lombok.Data;
 public class StrategyControlDataExt extends StrategyControlDataEntity{
     private String strategyName;
     private String optStatus;
+    private String optMethod;
 }

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

@@ -406,6 +406,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 StrategyControlDataExt strategyControlDataExt = new StrategyControlDataExt();
                 BeanUtils.copyProperties(strategyControlDataEntity, strategyControlDataExt);
                 strategyControlDataExt.setStrategyName(StrategyControlEnum.getDesc(strategy));
+                strategyControlDataExt.setOptMethod(StrategyControlEnum.getMethod(strategy));
                 if (StringUtils.isNotBlank(strategyControlDataEntity.getTime())) {
                     strategyControlDataExt.setOptStatus("优化中");
                     strategyControlDataExts.add(strategyControlDataExt);
@@ -419,6 +420,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                         ext.setBizId(baseCrossInfoPO.getId());
                         ext.setStrategyName("无策略");
                         ext.setOptStatus("未优化");
+                        ext.setOptMethod("畅通");
                         ext.setStatus(0);
                         for (StrategyControlDataExt strategyControlDataExt : strategyControlDataExts) {
                             if (StringUtils.equals(baseCrossInfoPO.getId(), strategyControlDataExt.getBizId())) {