[update] 优化信号机控制常量参数

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

 package net.wanji.web.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
+import net.wanji.common.enums.ControlModeEnum;
+import net.wanji.common.framework.Constants;
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.feign.pojo.vo.*;
 import net.wanji.feign.service.UtcFeignClients;
@@ -64,39 +66,39 @@ public class FeignProxyServiceImpl implements FeignProxyService {
 
     @Override
     public JsonViewObject allRedControl(ControlCommandVO commandVO) {
-        Integer controlType = commandVO.getControlType();
         String resultMessage = "";
+        Integer controlType = commandVO.getControlType();
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         if (1 == controlType) {
             jsonViewObject = utcFeignClients.allRedControl(commandVO);
-            resultMessage = "全红";
+            resultMessage = ControlModeEnum.FULL_RED.getName();
         }
         if (2 == controlType) {
             jsonViewObject = utcFeignClients.yellowLightControl(commandVO);
-            resultMessage = "黄闪";
+            resultMessage = ControlModeEnum.YELLOW_FLASH.getName();
         }
         if (3 == controlType) {
             jsonViewObject = utcFeignClients.closeLightControl(commandVO);
-            resultMessage = "关灯";
+            resultMessage = ControlModeEnum.OFF_LIGHT.getName();
         }
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
-            return jsonViewObject.fail("灯态控制UTC服务调用异常");
+            return jsonViewObject.fail("全红黄闪灯态控制UTC服务调用异常");
         }
-        insertControlHist(commandVO.getCrossCode(), controlType + 1, "admin");
-        return jsonViewObject.success(resultMessage.concat("控制下发成功"));
+        insertControlHist(commandVO.getCrossCode(), controlType + 1, Constants.ProcessService.ADMIN_ID);
+        return jsonViewObject.success(resultMessage.concat("控制成功"));
     }
 
     @Override
     public JsonViewObject stepControl(StepControlVO stepControlVO) {
-        String resultMessage = "步进控制下发成功";
+        String resultMessage = "步进控制成功";
         if (stepControlVO.getCommand() == 0) {
-            resultMessage = "步进控制恢复下发成功";
+            resultMessage = "步进控制恢复成功";
         }
         JsonViewObject jsonViewObject = utcFeignClients.stepControl(stepControlVO.getCode(), stepControlVO.getCommand(), stepControlVO.getStepNum());
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("步进控制-步进控制/恢复UTC服务调用异常");
         }
-        insertControlHist(stepControlVO.getCode(), 7, "admin");
+        insertControlHist(stepControlVO.getCode(), 7, Constants.ProcessService.ADMIN_ID);
         return jsonViewObject.success(resultMessage);
     }
 
@@ -107,21 +109,21 @@ public class FeignProxyServiceImpl implements FeignProxyService {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("恢复时间表-恢复路口时间表执行UTC服务调用异常");
         }
-        insertControlHist(code, 1, "admin");
-        return jsonViewObject.success("恢复时间表-恢复路口时间表下发成功");
+        insertControlHist(code, 1, Constants.ProcessService.ADMIN_ID);
+        return jsonViewObject.success("恢复时间表-恢复路口时间表成功");
     }
 
     @Override
     public JsonViewObject lockControl(LockControlVO lockControlVO) {
-        String resultMessage = "锁定控制-相位锁定下发成功";
+        String resultMessage = "锁定控制-相位锁定控制成功";
         if (lockControlVO.getCommand() == 0) {
-            resultMessage = "锁定控制-相位锁定恢复下发成功";
+            resultMessage = "锁定控制-相位锁定恢复成功";
         }
         JsonViewObject jsonViewObject = utcFeignClients.lockControl(lockControlVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("锁定控制-相位锁定/解锁UTC服务调用异常");
         }
-        insertControlHist(lockControlVO.getCrossCode(), 4, "admin");
+        insertControlHist(lockControlVO.getCrossCode(), 4, Constants.ProcessService.ADMIN_ID);
         return jsonViewObject.success(resultMessage);
     }