From d3417407db947cf6f10c163d75325fd7df408eab Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期日, 03 八月 2025 15:19:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/controller/OpenController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/controller/OpenController.java b/src/main/java/com/zy/core/controller/OpenController.java
index f948742..7b23c25 100644
--- a/src/main/java/com/zy/core/controller/OpenController.java
+++ b/src/main/java/com/zy/core/controller/OpenController.java
@@ -12,6 +12,7 @@
import com.zy.core.properties.DeviceConfig;
import com.zy.core.thread.FakeThread;
import com.zy.core.thread.ForkLiftThread;
+import com.zy.core.thread.LiftThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.utils.DeviceMsgUtils;
import com.zy.core.utils.FakeDeviceUtils;
@@ -52,7 +53,9 @@
if (param.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);
} else if (param.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
- fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);
+ fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 2);
+ } else if (param.getDeviceType().equals(String.valueOf(SlaveType.Lift))) {
+ fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 3);
}
if (fakeThread == null) {
@@ -72,7 +75,9 @@
if (param.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);
} else if (param.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
- fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);
+ fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 2);
+ } else if (param.getDeviceType().equals(String.valueOf(SlaveType.Lift))) {
+ fakeThread = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 3);
}
if (fakeThread == null) {
@@ -93,10 +98,12 @@
public R getFakeThreadStatusList() {
FakeThread fakeThread1 = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 1);
FakeThread fakeThread2 = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 2);
+ FakeThread fakeThread3 = (FakeThread) SlaveConnection.get(SlaveType.FakeThread, 3);
HashMap<String, Object> map = new HashMap<>();
map.put("fakeNyShuttleStatusMap", fakeThread1.getFakeStatusMap());
map.put("fakeZyForkLiftStatusMap", fakeThread2.getFakeStatusMap());
+ map.put("fakeNyLiftStatusMap", fakeThread3.getFakeStatusMap());
return R.ok().add(map);
}
@@ -130,6 +137,12 @@
continue;
}
deviceList.add(forkLiftThread.getDeviceConfig());
+ } else if (slaveType.equals(SlaveType.Lift)) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(slaveType, config.getDeviceNo());
+ if(liftThread == null){
+ continue;
+ }
+ deviceList.add(liftThread.getDeviceConfig());
}
}
--
Gitblit v1.9.1