From 21eac69df8b18ef44ab267a4e2efe714f985d8d9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 14:26:57 +0800
Subject: [PATCH] 提升机穿梭车配置
---
src/main/java/com/zy/asrs/controller/LiftController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 2226d09..a45f231 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -52,14 +52,13 @@
@ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
public R liftStateTable(){
List<LiftStateTableVo> list = new ArrayList<>();
- List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
- for (BasLift basLift : lifts) {
+ for (LiftSlave slave : slaveProperties.getLift()) {
// 琛ㄦ牸琛�
LiftStateTableVo vo = new LiftStateTableVo();
- vo.setLiftNo(basLift.getLiftNo()); //鎻愬崌鏈哄彿
+ vo.setLiftNo(slave.getId()); //鎻愬崌鏈哄彿
list.add(vo);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
if (liftThread == null) {
vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
continue;
@@ -100,14 +99,13 @@
@ManagerAuth(memo = "鎻愬崌鏈烘暟鎹〃")
public R liftMsgTable(){
List<LiftMsgTableVo> list = new ArrayList<>();
- List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
- for (BasLift basLift : lifts) {
+ for (LiftSlave slave : slaveProperties.getLift()) {
// 琛ㄦ牸琛�
LiftMsgTableVo vo = new LiftMsgTableVo();
- vo.setLiftNo(basLift.getLiftNo()); // 鎻愬崌鏈哄彿
+ vo.setLiftNo(slave.getId()); // 鎻愬崌鏈哄彿
list.add(vo);
// 鑾峰彇鎻愬崌鏈轰俊鎭�
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
if (liftThread == null) {
continue;
}
--
Gitblit v1.9.1