From 8f93d32b15cff5287a07649da92bd5b6276c14e2 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 22:13:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 9471b80..c0a5e5d 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -20,7 +20,6 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.JarSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.JarCommand;
import com.zy.core.model.protocol.JarProtocol;
import lombok.Data;
@@ -64,7 +63,7 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write(null);
+ write((JarCommand) task.getData());
break;
default:
break;
@@ -155,6 +154,16 @@
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
+
+//
+// jarProtocol.setMode(2);//妯″紡
+// jarProtocol.setStatus((short)1);//鐘舵��
+// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+// jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
--
Gitblit v1.9.1