恢复灯态之前的代码

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

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author hanbing
  * @date 2023/01/04 16:10
@@ -124,7 +126,22 @@ public class PlanSendController {
             @ApiResponse(code = 200, message = "OK", response = SaveSchemeConfigDTO.PhaseListElement.class),
     })
     public JsonViewObject phaseListByTimeSingleRing(@RequestBody CrossIdAndTimeDTO crossIdAndTimeDTO) {
-        RingPhasePO ringPhasePO = planSendService.phaseListByTimeSingleRing(crossIdAndTimeDTO);
+        List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTime
+                = planSendService.phaseListByTimeSingleRing(crossIdAndTimeDTO);
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+
+        return jsonViewObject.success(phaseListByTime);
+
+    }
+
+    @AspectLog(description = "根据当前时间返回相位列表-方案优化对比", operationType = BaseEnum.OperationTypeEnum.UPDATE)
+    @ApiOperation(value = "根据当前时间返回相位列表-方案优化对比）", notes = "根据当前时间返回相位列表-方案优化对比")
+    @PostMapping("/phaseListByTimeSingleRingNew")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = SaveSchemeConfigDTO.PhaseListElement.class),
+    })
+    public JsonViewObject phaseListByTimeSingleRingNew(@RequestBody CrossIdAndTimeDTO crossIdAndTimeDTO) {
+        RingPhasePO ringPhasePO = planSendService.phaseListByTimeSingleRingNew(crossIdAndTimeDTO);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
 
         return jsonViewObject.success(ringPhasePO);

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

@@ -2,13 +2,12 @@ package net.wanji.web.service;
 
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.bo.CrossIdBO;
-import net.wanji.web.dto.CrossIdAndPhaseIdsDTO;
-import net.wanji.web.dto.CrossIdAndTimeDTO;
-import net.wanji.web.dto.ScheduleIdDTO;
-import net.wanji.web.dto.SchemeIdDTO;
+import net.wanji.web.dto.*;
 import net.wanji.web.po.RingPhasePO;
 import net.wanji.web.vo.PhaseListByTimeVO;
 
+import java.util.List;
+
 /**
  * @author Kent HAN
  * @date 2022/11/3 16:14
@@ -32,7 +31,9 @@ public interface PlanSendService {
 
     PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO);
 
-    RingPhasePO phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO);
+//    RingPhasePO phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO);
+    RingPhasePO phaseListByTimeSingleRingNew(CrossIdAndTimeDTO crossIdAndTimeDTO);
+    List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO);
 
     /**
      * 下发数据到utc数据库

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

@@ -624,7 +624,7 @@ public class PlanSendServiceImpl implements PlanSendService {
     }
 
     @Override
-    public RingPhasePO phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO) {
+    public RingPhasePO phaseListByTimeSingleRingNew(CrossIdAndTimeDTO crossIdAndTimeDTO) {
         RingPhasePO ringPhasePO = new RingPhasePO();
         List<SaveSchemeConfigDTO.PhaseListElement> oriPhaseList = new ArrayList<>();
         List<SaveSchemeConfigDTO.PhaseListElement> optPhaseList = new ArrayList<>();
@@ -727,6 +727,26 @@ public class PlanSendServiceImpl implements PlanSendService {
         return ringPhasePO;
     }
 
+    @Override
+    public List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO) {
+        List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTime = new ArrayList<>();
+
+        PhaseListByTimeVO phaseListByTimeVO = phaseListByTime(crossIdAndTimeDTO);
+        SaveSchemeConfigDTO.PhaseScheme phaseScheme = phaseListByTimeVO.getPhaseScheme();
+        if (phaseScheme != null) {
+            List<SaveSchemeConfigDTO.RingListElement> ringList = phaseScheme.getRingList();
+            SaveSchemeConfigDTO.RingListElement ringListElement = ringList.get(0);
+            List<SaveSchemeConfigDTO.GroupListElement> groupList = ringListElement.getGroupList();
+
+            for (SaveSchemeConfigDTO.GroupListElement groupListElement : groupList) {
+                List<SaveSchemeConfigDTO.PhaseListElement> phaseList = groupListElement.getPhaseList();
+                phaseListByTime.addAll(phaseList);
+            }
+        }
+
+        return phaseListByTime;
+    }
+
     private PhaseListByTimeVO getPhaseListByTimeVO(String planName, Date datetime, RunningPlanDTO runningPlanDTO,
                                                    CrossIdBO crossIdBO) {
         PhaseListByTimeVO phaseListByTimeVO = new PhaseListByTimeVO();