[update] 统一特殊控制类型码值

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

@@ -71,7 +71,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
         String resultMessage = "";
         Integer controlType = commandVO.getControlType();
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-        if (1 == controlType) {
+        if (3 == controlType) {
             jsonViewObject = utcFeignClients.allRedControl(commandVO);
             resultMessage = ControlModeEnum.FULL_RED.getName();
         }
@@ -79,7 +79,7 @@ public class FeignProxyServiceImpl implements FeignProxyService {
             jsonViewObject = utcFeignClients.yellowLightControl(commandVO);
             resultMessage = ControlModeEnum.YELLOW_FLASH.getName();
         }
-        if (3 == controlType) {
+        if (1 == controlType) {
             jsonViewObject = utcFeignClients.closeLightControl(commandVO);
             resultMessage = ControlModeEnum.OFF_LIGHT.getName();
         }

signal-utc-dt-service/src/main/java/net/wanji/utc/dt/service/controller/impl/DTControlCommandServiceImpl.java

@@ -348,13 +348,13 @@ public class DTControlCommandServiceImpl implements ControlCommandService {
         if (commandVO.getCommand() == 0) {
             controlmodel = ControlModelEnum.FIXED_CYCLE.getDtControlHex(); // 取消控制，设置为固定配时
         } else {
-            if (commandVO.getControlType() == 1) { // 全红
+            if (commandVO.getControlType() == 3) { // 全红
                 controlmodel = ControlModelEnum.RED_CONTROL.getDtControlHex();
             }
             if (commandVO.getControlType() == 2) { // 黄闪
                 controlmodel = ControlModelEnum.YELLOW_CONTROL.getDtControlHex();
             }
-            if (commandVO.getControlType() == 3) { // 关灯
+            if (commandVO.getControlType() == 1) { // 关灯
                 controlmodel = ControlModelEnum.CLOSED_CONTROL.getDtControlHex();
             }
         }

wj-databus/src/main/java/net/wanji/databus/vo/ControlCommandVO.java

@@ -28,7 +28,7 @@ public class ControlCommandVO {
     @Min(value = 0, message = "控制类型：1是；0否")
     private Integer command;
 
-    @ApiModelProperty(value = "1全红 2黄闪 3关灯")
+    @ApiModelProperty(value = "1关灯 2黄闪 3全红")
     private Integer controlType;
 
     @ApiModelProperty(value = "持续时间")