新增接口-方案优化对比，新增黃闪逻辑处理

signal-control-service/src/main/java/net/wanji/web/controller/PlanSendController.java

@@ -163,6 +163,19 @@ public class PlanSendController {
         return jsonViewObject.success(ringPhasePO);
     }
 
+    @AspectLog(description = "根据当前时间返回相位列表-方案优化对比-新增黃闪模式", operationType = BaseEnum.OperationTypeEnum.UPDATE)
+    @ApiOperation(value = "根据当前时间返回相位列表-方案优化对比-新增黃闪模式）", notes = "根据当前时间返回相位列表-方案优化对比-新增黃闪模式")
+    @PostMapping("/phaseListByTimeSingleRingNewControlMode")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = SaveSchemeConfigDTO.PhaseListElement.class),
+    })
+    public JsonViewObject phaseListByTimeSingleRingNewControlMode(@RequestBody CrossIdAndTimeDTO crossIdAndTimeDTO) {
+        RingPhasePO ringPhasePO = planSendService.phaseListByTimeSingleRingNew(crossIdAndTimeDTO);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+
+        return jsonViewObject.success(ringPhasePO);
+    }
+
     @AspectLog(description = "根据路口号和时间(据当前时间半小时)返回相位列表-方案优化对比", operationType = BaseEnum.OperationTypeEnum.UPDATE)
     @ApiOperation(value = "根据路口号和时间(据当前时间半小时)返回相位列表-方案优化对比）", notes = "根据路口号和时间(据当前时间半小时)返回相位列表-方案优化对比")
     @PostMapping("/phaseListByTimeRingNew")

signal-control-service/src/main/java/net/wanji/web/po/RingPhasePO.java

 package net.wanji.web.po;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import net.wanji.web.dto.SaveSchemeConfigDTO;
 
@@ -13,9 +14,16 @@ import java.util.List;
  */
 @Data
 public class RingPhasePO {
-    //优化前的方案列表
+    @ApiModelProperty(value = "路口编号")
+    private String crossId;
+
+    @ApiModelProperty(value = "控制模式：1定周期；2绿波协调；3黄闪；4全红；5关灯；6单点自适应；7全感应；8半感应；9行人过街")
+    private Integer controlMode;
+
+    @ApiModelProperty(value = "优化前的方案列表")
     private List<SaveSchemeConfigDTO.PhaseListElement> oriPhaseList;
-    //优化后的方案列表
+
+    @ApiModelProperty(value = "优化后的方案列表")
     private List<SaveSchemeConfigDTO.PhaseListElement> optPhaseList;
 
 }

signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java

@@ -776,6 +776,7 @@ public class PlanSendServiceImpl implements PlanSendService {
     @Override
     public RingPhasePO phaseListByTimeSingleRingNew(CrossIdAndTimeDTO crossIdAndTimeDTO) {
         RingPhasePO ringPhasePO = new RingPhasePO();
+        ringPhasePO.setCrossId(crossIdAndTimeDTO.getCrossId());
         List<SaveSchemeConfigDTO.PhaseListElement> oriPhaseList = new ArrayList<>();
         List<SaveSchemeConfigDTO.PhaseListElement> optPhaseList = new ArrayList<>();
         QueryByCrossIdAndTimeDTO queryByCrossIdAndTimeDTO = new QueryByCrossIdAndTimeDTO();
@@ -794,6 +795,7 @@ public class PlanSendServiceImpl implements PlanSendService {
         int schemeId = Integer.valueOf(content.getSchemeNo());
         //黃闪
         if (schemeId == 85){
+            ringPhasePO.setControlMode(3);
             return ringPhasePO;
         }
         /*CrossIdBO crossIdBO = new CrossIdBO();
@@ -863,6 +865,7 @@ public class PlanSendServiceImpl implements PlanSendService {
                 }
             }
         }
+        ringPhasePO.setControlMode(1);
         ringPhasePO.setOriPhaseList(oriPhaseList);
         ringPhasePO.setOptPhaseList(optPhaseList);
         return ringPhasePO;