From 7ba995f514c6d20a59cc69afa05110110e9b2de5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 十月 2023 08:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into skwcs
---
src/main/java/com/zy/common/utils/NyLiftUtils.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyLiftUtils.java b/src/main/java/com/zy/common/utils/NyLiftUtils.java
index 93cc8da..cee6584 100644
--- a/src/main/java/com/zy/common/utils/NyLiftUtils.java
+++ b/src/main/java/com/zy/common/utils/NyLiftUtils.java
@@ -29,6 +29,19 @@
return command;
}
+ /**
+ * 鑾峰彇鎻愬崌鏈哄浣嶅懡浠�
+ */
+ public static NyLiftCommand getLiftResetCommand(Integer liftNo) {
+ NyLiftCommand command = new NyLiftCommand();
+ command.setLiftNo(liftNo.shortValue());
+ command.setTaskNo((short) 0);
+ command.setTaskModel((short) 0);
+ command.setSourceSta((short) 0);
+ command.setTargetSta((short) 0);
+ return command;
+ }
+
//鑾峰彇鎻愬崌鏈虹珯鐐�
public static LiftStaProtocol getLiftStaByStaNo(Integer staNo) {
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
@@ -39,7 +52,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getStaNo() == staNo) {
+ if (liftStaProtocol.getStaNo().equals(staNo)) {
return liftStaProtocol;
}
}
@@ -56,7 +69,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getStaNo() == staNo) {
+ if (liftStaProtocol.getStaNo().equals(staNo)) {
return liftStaProtocol;
}
}
@@ -72,7 +85,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getLev() == lev) {
+ if (liftStaProtocol.getLev().equals(lev)) {
return liftStaProtocol;
}
}
--
Gitblit v1.9.1