From d2c0bccd2e6dde4cf2a614a67bbf0ed45e2bcbaf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 十一月 2024 13:59:22 +0800
Subject: [PATCH] # 213

---
 src/main/java/com/zy/core/thread/JarThread.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 3b2b223..24186b4 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -178,6 +178,18 @@
 
                 jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
 
+//                if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+//                    jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+//                } else
+                if (jarProtocol.statusType .equals(JarStatusType.SOS2)){
+                    jarProtocol.setHoldingSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){
+                    jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){
+                    jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
+                }
+
+                jarProtocol.setUpStatus(jarProtocol.getStatus());
 //
 //                jarProtocol.setMode(2);//妯″紡
 //                jarProtocol.setStatus((short)6);//鐘舵��

--
Gitblit v1.9.1