[update] 日计划，调度

signal-utc-dt-service/src/main/java/net/wanji/com/common/constants/Constants.java

@@ -23,7 +23,9 @@ public class Constants {
     public static final String COMMAND_LIGHT_CONFIG = "0302";
     public static final String COMMAND_PHASE_STAGE_CONFIG = "0602";
     public static final String COMMAND_SCHME_CONFIG = "0902";
-    public static final String COMMAND_DAILYPLAN_CONFIG = "1102";
+    public static final String COMMAND_DAILYPLAN_CONFIG = "0b02";
+    public static final String COMMAND_SCHEDULE_CONFIG = "0c02";
+    public static final String COMMAND_RUNNING_STATUS = "0d02";
 
 
 

signal-utc-dt-service/src/main/java/net/wanji/com/common/enums/CommandResultSign.java

@@ -19,9 +19,9 @@ public enum CommandResultSign {
     GET_STAGE_INFO("060220", "getStageInfoService"),
     GET_PHASE_SECURITY_INFO("2007", "getPhaseSecurityInfoService"),
     GET_SCHEME_INFO("090220", "getSchemeInfoService"),
-    GET_DAILY_PLAN_INFO("110220", "getDailyPlanInfoService"),
-    GET_SCHEDULES_INFO("2012", "getSchedulesInfoService"),
-    GET_RUNNING_STATE_INFO("2013", "getRunningStateInfoService"),
+    GET_DAILY_PLAN_INFO("0b0220", "getDailyPlanInfoService"),
+    GET_SCHEDULES_INFO("0c0220", "getSchedulesInfoService"),
+    GET_RUNNING_STATE_INFO("0d0220", "getRunningStateInfoService"),
     GET_TRAFFIC_DATA_INFO("2014", "getTrafficDataInfoService"),
     GET_ALARM_INFO("2015", "getAlarmInfoService"),
     GET_FAULT_INFO("2016", "getFaultInfoService"),

signal-utc-dt-service/src/main/java/net/wanji/com/controller/StaticInfoController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.core.MediaType;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -96,10 +95,10 @@ public class StaticInfoController {
         // 命令调用
         staticInfoService.crossSchedules(crossSchedulesDTO);
         // 构造返回值
-        List<String> crossIdList = crossSchedulesDTO.getCrossIdList();
-        List<CrossSchedulesPO> crossSchedulesPOList = staticInfoService.buildCrossSchedulesResponse(crossIdList);
+//        List<String> crossIdList = crossSchedulesDTO.getCrossIdList();
+//        List<CrossSchedulesPO> crossSchedulesPOList = staticInfoService.buildCrossSchedulesResponse(crossIdList);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
 
-        return jsonViewObject.success(crossSchedulesPOList);
+        return jsonViewObject.success(null);
     }
 }

signal-utc-dt-service/src/main/java/net/wanji/com/pojo/dtconvert/ScheduleInfoPojo.java

+package net.wanji.com.pojo.dtconvert;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author duanruiming
+ * @date 2023/06/15 15:07
+ */
+@Data
+public class ScheduleInfoPojo {
+    private Integer scheduleId;
+    private Integer crossId;
+    private Integer priority;
+    private List<Integer> week;
+    private List<Integer> month;
+    private List<Integer> day;
+    private Integer dailyPlanId;
+
+}

signal-utc-dt-service/src/main/java/net/wanji/com/service/controller/StaticInfoService.java

@@ -17,9 +17,9 @@ public interface StaticInfoService extends BeanMarkService {
 
     SchemePhaseLightsVO schemePhaseLights(SchemePhaseLightsDTO schemePhaseLightsDTO) throws Exception;
 
-    void planSection(PlanSectionDTO planSectionDTO) throws Exception;
+    List<PlanSectionVO> planSection(PlanSectionDTO planSectionDTO) throws Exception;
 
-    void crossSchedules(CrossSchedulesDTO crossSchedulesDTO) throws Exception;
+    List<CrossSchedulesPO> crossSchedules(CrossSchedulesDTO crossSchedulesDTO) throws Exception;
 
     SchemePhaseLightsVO buildSchemePhaseLightsResponse(SchemePhaseLightsDTO schemePhaseLightsDTO);
 

wj-databus/src/main/java/net/wanji/databus/dto/CrossSchedulesDTO.java

@@ -5,9 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
-import java.util.List;
 
 /**
  * @author Kent HAN
@@ -16,12 +13,7 @@ import java.util.List;
 @Data
 @ApiModel(value = "CrossSchedulesDTO", description = "查询时间表数据输入参数")
 public class CrossSchedulesDTO {
-    @ApiModelProperty(value = "厂商代码 HK")
+    @ApiModelProperty(value = "路口编号")
     @NotBlank
-    @Pattern(regexp = "^[A-Z]*$", message = "厂商代码只能包含大写英文字母")
-    String manufacturerCode;
-
-    @ApiModelProperty(value = "路口列表")
-    @NotEmpty
-    List<String> crossIdList;
+    private String crossId;
 }