From b63790fa580ea78777f16bff6bc79373d675dd10 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 八月 2025 16:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index e5a01e7..0ff3b77 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -160,7 +160,7 @@
if (null == liftProtocol) {
liftProtocol = new LiftProtocol();
liftProtocol.setLiftNo(device.getDeviceNo());
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.NONE);
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
InnerLiftExtend innerLiftExtend = new InnerLiftExtend();
liftProtocol.setExtend(innerLiftExtend);
@@ -171,8 +171,8 @@
liftProtocol.setModel(data.getInteger("model"));
//PLC浠诲姟鍙�
liftProtocol.setPlcTaskNo(data.getInteger("plcTaskNo"));
- //浠诲姟鐘舵��
- liftProtocol.setProtocolStatus(data.getInteger("protocolStatus"));
+ //璁惧鐘舵��
+ liftProtocol.setDeviceStatus(data.getInteger("deviceStatus"));
//浠诲姟妯″紡
liftProtocol.setTaskMode(data.getInteger("taskMode"));
//鍙栬揣鏁版嵁
@@ -397,6 +397,8 @@
}
this.liftProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
+ this.setSyncTaskNo(0);
+ this.setProtocolStatus(LiftProtocolStatusType.IDLE);
response.setMessage(JSON.toJSONString(result));
response.setResult(true);
return response;
@@ -422,7 +424,7 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
boolean res = this.liftProtocol.getProtocolStatus() == LiftProtocolStatusType.IDLE.id
- && this.liftProtocol.getPlcTaskNo() == 0
+// && this.liftProtocol.getPlcTaskNo() == 0
&& this.liftProtocol.getTaskNo() == 0
&& this.liftProtocol.getModel() == 2
&& this.liftProtocol.getErrorCode() == 0
--
Gitblit v1.9.1