From 4b1ae610e4ec8337f53c5c895c01eddaf3dabd2e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 26 九月 2025 16:01:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 a11eccf..9a49e55 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -181,8 +181,6 @@
liftProtocol.setHasTray(data.getInteger("hasTray") == 1);
//鏈夊皬杞�
liftProtocol.setHasCar(data.getInteger("hasCar") == 1);
- //鍑哄叆搴撴ā寮�
- liftProtocol.setIOMode(data.getInteger("iOMode"));
//鏁呴殰鐮�
liftProtocol.setErrorCode(data.getInteger("errorCode"));
//褰撳墠灞�
@@ -355,7 +353,7 @@
@Override
public CommandResponse switchIOMode(LiftIoModeType type) {
CommandResponse response = new CommandResponse(true);
- liftProtocol.setIOModeType(type);
+ liftProtocol.setIOMode(type);
return response;
}
@@ -412,8 +410,7 @@
}
}
- if (this.liftProtocol.getProtocolStatus() == null
- || this.liftProtocol.getModel() == null
+ if (this.liftProtocol.getModel() == null
|| this.liftProtocol.getDeviceStatus() == null
|| this.liftProtocol.getErrorCode() == null
|| this.liftProtocol.getExtend() == null
@@ -423,8 +420,7 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
- boolean res = this.liftProtocol.getProtocolStatus() == LiftProtocolStatusType.IDLE.id
- && this.liftProtocol.getModel() == 2
+ boolean res = this.liftProtocol.getModel() == 2
&& this.liftProtocol.getDeviceStatus() == LiftDeviceStatusType.IDLE.id
&& this.liftProtocol.getErrorCode() == 0
&& !extend.getFrontOverrun()
--
Gitblit v1.9.1