实时大屏代码微调

taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java

@@ -754,8 +754,7 @@ public class DeviceEventListener extends EventListener {
         }
 
         //非流程必须项，直接放行
-        //正在出铁中，直接发行
-        if ("0".equals(stepVO.getRequired()) || ironLoading1.get()) {
+        if ("0".equals(stepVO.getRequired())) {
             stepVO.setPassResult(1);
             return;
         }
@@ -805,40 +804,43 @@ public class DeviceEventListener extends EventListener {
                 return;
             }
         }
-    }
-
-    private boolean validateManualData(IronStepDTO message, String userId, IronStepVO stepDTO) {
-        if (Objects.equals(stepDTO.getStepId(), message.getStepId()) && Objects.equals(stepDTO.getIdentifier(), message.getIdentifier()) && Objects.equals("2", stepDTO.getConfirmMode())) {
-            stepDTO.setData(message.getData());
-            setStepResult(mSteps);
-            PushData.send2Operation(mSteps, ironLoading1.get());
-            //这里手动记录时间
-            log.info("userId:{},stepId:{},identifier:{},data:{},pass:{}", userId, message.getStepId(), message.getIdentifier(), message.getData(), message.isPass());
 
+        setStepResult(mSteps);
+        PushData.send2Operation(mSteps, ironLoading1.get());
 
-            if (Objects.equals(message.getIdentifier(), CAR_STATUS)) {
-                RealtimeData realtimeData = new RealtimeData();
-                realtimeData.setValue(message.getData());
-                realtimeData.setDesc("鱼雷罐车到位状态");
-                mRealtimeStatus.put(CAR_STATUS, realtimeData);
-            }
+        for (IronStepVO stepDTO : mSteps) {
+            for (IronStepVO child : stepDTO.getChilds()) {
+                if (Objects.equals(child.getIdentifier(), CAR_STATUS)) {
+                    RealtimeData realtimeData = new RealtimeData();
+                    realtimeData.setValue(child.getPassResult());
+                    realtimeData.setDesc("鱼雷罐车到位状态");
+                    mRealtimeStatus.put(CAR_STATUS, realtimeData);
+                }
 
-            if (Objects.equals(message.getIdentifier(), GUN_STATUS)) {
-                RealtimeData realtimeData = new RealtimeData();
-                realtimeData.setValue(message.getData());
-                realtimeData.setDesc("拔炮状态");
-                mRealtimeStatus.put(GUN_STATUS, realtimeData);
+                if (Objects.equals(child.getIdentifier(), GUN_STATUS)) {
+                    RealtimeData realtimeData = new RealtimeData();
+                    realtimeData.setValue(child.getPassResult());
+                    realtimeData.setDesc("拔炮状态");
+                    mRealtimeStatus.put(GUN_STATUS, realtimeData);
+                }
+                if (Objects.equals(child.getIdentifier(), MOUTH_STATUS)) {
+                    RealtimeData realtimeData = new RealtimeData();
+                    realtimeData.setValue(child.getPassResult());
+                    realtimeData.setDesc("摆动溜嘴状态");
+                    mRealtimeStatus.put(MOUTH_STATUS, realtimeData);
+                }
+                PushData.send2RealtimeStatus(mRealtimeStatus);
             }
+        }
 
+    }
 
-            if (Objects.equals(message.getIdentifier(), MOUTH_STATUS)) {
-                RealtimeData realtimeData = new RealtimeData();
-                realtimeData.setValue(message.getData());
-                realtimeData.setDesc("摆动溜嘴状态");
-                mRealtimeStatus.put(MOUTH_STATUS, realtimeData);
-            }
+    private boolean validateManualData(IronStepDTO message, String userId, IronStepVO stepDTO) {
+        if (Objects.equals(stepDTO.getStepId(), message.getStepId()) && Objects.equals(stepDTO.getIdentifier(), message.getIdentifier()) && Objects.equals("2", stepDTO.getConfirmMode())) {
+            stepDTO.setData(message.getData());
 
-            PushData.send2RealtimeStatus(mRealtimeStatus);
+            //这里手动记录时间
+            log.info("userId:{},stepId:{},identifier:{},data:{},pass:{}", userId, message.getStepId(), message.getIdentifier(), message.getData(), message.isPass());
 
             return true;
         }