方案管理-计划数据增加开始时间、结束时间数组

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

@@ -39,6 +39,8 @@ public class RunningPlanDTO {
         private String startTime;
         @ApiModelProperty(value = "结束时间", required = true)
         private String endTime;
+        @ApiModelProperty(value = "开始时间、结束时间", required = true)
+        private String[] startEndTime;
         @ApiModelProperty(value = "方案名", required = true)
         private String schemeName;
     }

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

@@ -136,6 +136,17 @@ public class RunningPlanServiceImpl implements RunningPlanService {
     private List<RunningPlanDTO.DailyPlanListElement> buildDailyPlanList(String crossId) {
         List<RunningPlanDTO.DailyPlanListElement> dailyPlanList = new ArrayList<>();
         dailyPlanList = crossPlanMapper.selectDailyPlanList(crossId);
+        for (RunningPlanDTO.DailyPlanListElement dailyPlan : dailyPlanList) {
+            List<RunningPlanDTO.TimeListElement> timeList = dailyPlan.getTimeList();
+            for (RunningPlanDTO.TimeListElement timeListElement : timeList) {
+                String[] startEndTime = new String[2];
+                String startTime = timeListElement.getStartTime();
+                String endTime = timeListElement.getEndTime();
+                startEndTime[0] = startTime;
+                startEndTime[1] = endTime;
+                timeListElement.setStartEndTime(startEndTime);
+            }
+        }
         return dailyPlanList;
     }
 
@@ -217,16 +228,17 @@ public class RunningPlanServiceImpl implements RunningPlanService {
                 CrossSchemePO crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeName(crossId, schemeName);
                 Integer schemeId = crossSchemePO.getId();
                 // 更新时段表
-                updateCrossSection(crossId, dailyPlan, crossPlanId, schemeId, time);
+                updateCrossSection(crossId, crossPlanId, schemeId, time);
             }
         }
     }
 
-    private void updateCrossSection(String crossId, RunningPlanDTO.DailyPlanListElement dailyPlan,
-                                    Integer crossPlanId, Integer schemeId, RunningPlanDTO.TimeListElement time) {
+    private void updateCrossSection(String crossId, Integer crossPlanId, Integer schemeId,
+                                    RunningPlanDTO.TimeListElement time) {
         CrossSectionPO crossSectionPO = new CrossSectionPO();
-        String startTime = time.getStartTime();
-        String endTime = time.getEndTime();
+        String[] startEndTime = time.getStartEndTime();
+        String startTime = startEndTime[0];
+        String endTime = startEndTime[1];
         String s = startTime + endTime;
         String sectionNo = s.replaceAll(":", "");
         crossSectionPO.setSectionNo(sectionNo);