From e3239cbdfb12aa1d44128470f011714c30a98c76 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 09:34:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 1268aff..f185a81 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -117,15 +117,21 @@
jarProtocol.setJarNo(slave.getId());
}
jarProtocol.setMode(siemensS7Net.getByteTransform().TransInt32(result.Content, 2));
- jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
+ jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//宸﹂棬鐘舵��
+ jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//鍙抽棬鐘舵��
+ jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//宸﹂棬鍙紑
+ jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//宸﹂棬鍙叧
+ jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//鍙抽棬鍙紑
+ jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//鍙抽棬鍙叧
+ jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransBool(result.Content, 4));//鑷�
+ jarProtocol.setJarErr(siemensS7Net.getByteTransform().TransInt32(result.Content, 4));//寮傚父鐮�
+
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
// 鍚屾pakMk
- BasJar one = service.selectById(slave.getId());
-
- BasJar basJar = new BasJar();
+ BasJar basJar = service.selectById(slave.getId());
basJar.setJarNo(slave.getId());
if (!service.updateById(jarProtocol.toSqlModel(basJar))){
News.error("纭寲缃恜lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
--
Gitblit v1.9.1