[update] 控制模式列表优化

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

@@ -84,21 +84,29 @@ public class FeignProxyServiceImpl implements FeignProxyService {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("全红黄闪灯态控制UTC服务调用异常");
         }
-        insertControlHist(commandVO.getCrossCode(), controlType + 1, Constants.ProcessService.ADMIN_ID);
+        Integer isnertControl = null;
+        if (Objects.equals(0, commandVO.getCommand())) {
+            isnertControl = 1;
+        } else {
+            isnertControl = controlType + 1;
+        }
+        insertControlHist(commandVO.getCrossCode(), isnertControl, Constants.ProcessService.ADMIN_ID);
         return jsonViewObject.success(resultMessage.concat("控制成功"));
     }
 
     @Override
     public JsonViewObject stepControl(StepControlVO stepControlVO) {
         String resultMessage = "步进控制成功";
+        Integer control = 7;
         if (stepControlVO.getCommand() == 0) {
+            control = 1;
             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, Constants.ProcessService.ADMIN_ID);
+        insertControlHist(stepControlVO.getCode(), control, Constants.ProcessService.ADMIN_ID);
         return jsonViewObject.success(resultMessage);
     }
 

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

@@ -64,6 +64,9 @@ public class SignalStatusTask {
                 }
                 Integer currentSignalStatus = signalStatusVO.getStatus() == null ? 0 : signalStatusVO.getStatus();
                 Integer currentFaultType = signalStatusVO.getFaultType() == null ? 0 : signalStatusVO.getFaultType();
+                if (currentSignalStatus == 1 && !Objects.equals(0, currentFaultType)) {
+                    currentSignalStatus = 2;
+                }
 
                 // 更新数据库状态
                 LambdaQueryWrapper<TDeviceStatusInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -72,9 +75,7 @@ public class SignalStatusTask {
                     TDeviceStatusInfo tDeviceStatusInfo = tDeviceStatusMapper.selectOne(lambdaQueryWrapper);
                     if (Objects.nonNull(tDeviceStatusInfo)) {
                         if (isExucuteUpdate(currentSignalStatus, currentFaultType, tDeviceStatusInfo)) {
-                            if (currentSignalStatus == 1 && !Objects.equals(0, currentFaultType)) {
-                                currentSignalStatus = 2;
-                            }
+
                             tDeviceStatusInfo.setFaultType(currentFaultType);
                             tDeviceStatusInfo.setGmtCreate(new Date()); // 实时数据，创建和修改时间一致
                             tDeviceStatusMapper.updateById(tDeviceStatusInfo);
@@ -85,8 +86,8 @@ public class SignalStatusTask {
                         deviceStatusInfo.setCode(crossId);
                         deviceStatusInfo.setName(name);
                         deviceStatusInfo.setType(1);
-                        deviceStatusInfo.setStatus(currentSignalStatus);
                         deviceStatusInfo.setFaultType(currentFaultType);
+                        deviceStatusInfo.setStatus(currentSignalStatus);
                         deviceStatusInfo.setGmtCreate(new Date());
                         deviceStatusInfo.setId(null);
                         tDeviceStatusMapper.insert(deviceStatusInfo);