[update] 信号机控制恢复提示优化

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

@@ -65,31 +65,39 @@ public class FeignProxyServiceImpl implements FeignProxyService {
     @Override
     public JsonViewObject allRedControl(ControlCommandVO commandVO) {
         Integer controlType = commandVO.getControlType();
+        String resultMessage = "";
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         if (1 == controlType) {
             jsonViewObject = utcFeignClients.allRedControl(commandVO);
+            resultMessage = "全红";
         }
         if (2 == controlType) {
             jsonViewObject = utcFeignClients.yellowLightControl(commandVO);
+            resultMessage = "黄闪";
         }
         if (3 == controlType) {
             jsonViewObject = utcFeignClients.closeLightControl(commandVO);
+            resultMessage = "关灯";
         }
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("灯态控制UTC服务调用异常");
         }
         insertControlHist(commandVO.getCrossCode(), controlType + 1, "admin");
-        return jsonViewObject.success("特殊灯态控制下发成功");
+        return jsonViewObject.success(resultMessage.concat("控制下发成功"));
     }
 
     @Override
     public JsonViewObject stepControl(StepControlVO stepControlVO) {
+        String resultMessage = "步进控制下发成功";
+        if (stepControlVO.getCommand() == 0) {
+            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");
-        return jsonViewObject.success("步进控制下发成功");
+        return jsonViewObject.success(resultMessage);
     }
 
     @Override
@@ -105,12 +113,16 @@ public class FeignProxyServiceImpl implements FeignProxyService {
 
     @Override
     public JsonViewObject lockControl(LockControlVO lockControlVO) {
+        String resultMessage = "锁定控制-相位锁定下发成功";
+        if (lockControlVO.getCommand() == 0) {
+            resultMessage = "锁定控制-相位锁定恢复下发成功";
+        }
         JsonViewObject jsonViewObject = utcFeignClients.lockControl(lockControlVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("锁定控制-相位锁定/解锁UTC服务调用异常");
         }
         insertControlHist(lockControlVO.getCrossCode(), 4, "admin");
-        return jsonViewObject.success("锁定控制-相位锁定/解锁下发成功");
+        return jsonViewObject.success(resultMessage);
     }
 
     @Override