From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/common/utils/LiftUtils.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/LiftUtils.java b/src/main/java/com/zy/common/utils/LiftUtils.java
index 127d9c6..0dcc3ec 100644
--- a/src/main/java/com/zy/common/utils/LiftUtils.java
+++ b/src/main/java/com/zy/common/utils/LiftUtils.java
@@ -35,7 +35,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- list.add(liftStaProtocol.getStaNo());
+ list.add(liftStaProtocol.getSiteId());
}
return list;
@@ -69,7 +69,7 @@
}
//鑾峰彇鎻愬崌鏈虹珯鐐�
- public static LiftStaProtocol getLiftStaByStaNo(Integer staNo) {
+ public static LiftStaProtocol getLiftStaByStaNo(Integer siteId) {
DeviceConfigService deviceConfigService = SpringUtils.getBean(DeviceConfigService.class);
List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Lift)));
@@ -80,7 +80,7 @@
}
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
- if (liftStaProtocol.getStaNo().equals(staNo)) {
+ if (liftStaProtocol.getSiteId().equals(siteId)) {
return liftStaProtocol;
}
}
@@ -95,7 +95,6 @@
if (liftThread == null) {
return null;
}
-
for (LiftStaProtocol liftStaProtocol : liftThread.getLiftStaProtocols()) {
if (liftStaProtocol.getLev().equals(lev)) {
return liftStaProtocol;
--
Gitblit v1.9.1