Merge remote-tracking branch 'origin/master'

signal-feign-service/src/main/java/net/wanji/feign/pojo/vo/StepControlVO.java

@@ -16,8 +16,8 @@ public class StepControlVO {
     @ApiModelProperty(value = "路口编号", notes = "路口编号")
     @NotBlank(message = "路口编号不能为空")
     private String code;
-    @ApiModelProperty(value = "1 开始步进 0 取消步进", notes = "1 开始步进 0 取消步进")
-    private int stepNum;
     @ApiModelProperty(value = "0 顺序步进 n 跳过n个相位", notes = "0 顺序步进 n 跳过n个相位")
+    private int stepNum;
+    @ApiModelProperty(value = "1 开始步进 0 取消步进", notes = "1 开始步进 0 取消步进")
     private Integer command;
 }

signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java

@@ -35,7 +35,7 @@ public class SignalStatusTask {
     }
 
     // 灯态，5秒一次
-    @Scheduled(fixedRate = 1 * 60 * 1000)
+    @Scheduled(fixedRate = 1 * 1000)
     public void lightStatus() {
         try {