From ce9c9af4a3710d17e17814bab629ab4ef474f3f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 09 七月 2025 11:16:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ForkLiftController.java |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ForkLiftController.java b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
index 747abf8..17c02b2 100644
--- a/src/main/java/com/zy/asrs/controller/ForkLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -10,7 +11,9 @@
 import com.zy.asrs.domain.param.LiftOperatorParam;
 import com.zy.asrs.domain.vo.*;
 import com.zy.asrs.entity.BasLift;
+import com.zy.asrs.entity.DeviceConfig;
 import com.zy.asrs.service.BasLiftService;
+import com.zy.asrs.service.DeviceConfigService;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.action.ForkLiftAction;
@@ -41,25 +44,27 @@
     @Autowired
     private CommonService commonService;
     @Autowired
-    private SlaveProperties slaveProperties;
-    @Autowired
     private BasLiftService basLiftService;
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
     private ForkLiftAction forkLiftAction;
+    @Autowired
+    private DeviceConfigService deviceConfigService;
 
     @PostMapping("/table/lift/state")
     @ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
     public R liftStateTable(){
         ArrayList<JSONObject> list = new ArrayList<>();
-        for (ForkLiftSlave slave : slaveProperties.getForkLift()) {
+        List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+        for (DeviceConfig device : forkliftList) {
             // 琛ㄦ牸琛�
             JSONObject baseObj = new JSONObject();
-            baseObj.put("shuttleNo", slave.getId());
+            baseObj.put("shuttleNo", device.getDeviceNo());
             list.add(baseObj);
             // 鑾峰彇鎻愬崌鏈轰俊鎭�
-            ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, slave.getId());
+            ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo());
             if (forkLiftThread == null) {
                 continue;
             }
@@ -79,13 +84,15 @@
     @ManagerAuth(memo = "鎻愬崌鏈烘暟鎹〃")
     public R liftMsgTable(){
         List<LiftMsgTableVo> list = new ArrayList<>();
-        for (ForkLiftSlave slave : slaveProperties.getForkLift()) {
+        List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+        for (DeviceConfig device : forkliftList) {
             // 琛ㄦ牸琛�
             LiftMsgTableVo vo = new LiftMsgTableVo();
-            vo.setLiftNo(slave.getId());   //  鎻愬崌鏈哄彿
+            vo.setLiftNo(device.getDeviceNo());   //  鎻愬崌鏈哄彿
             list.add(vo);
             // 鑾峰彇鎻愬崌鏈轰俊鎭�
-            ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, slave.getId());
+            ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo());
             if (forkLiftThread == null) {
                 continue;
             }
@@ -117,10 +124,12 @@
     @GetMapping("/detl/{liftNo}")
     public R liftDetl(@PathVariable("liftNo") Integer liftNo){
         LiftDataVo vo = new LiftDataVo();
-        for (ForkLiftSlave liftSlave : slaveProperties.getForkLift()) {
-            if (liftNo.equals(liftSlave.getId())) {
-                vo.setLiftNo(liftSlave.getId());
-                BasLift basLift = basLiftService.selectById(liftSlave.getId());
+        List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+        for (DeviceConfig device : forkliftList) {
+            if (liftNo.equals(device.getDeviceNo())) {
+                vo.setLiftNo(device.getDeviceNo());
+                BasLift basLift = basLiftService.selectById(device.getDeviceNo());
                 if (!Cools.isEmpty(basLift)) {
                     vo.setWorkNo(basLift.getWrkNo());
                     vo.setPakMk(basLift.getPakMk());
@@ -134,11 +143,13 @@
     @GetMapping("/sensor/detl/{liftNo}")
     public R liftSensorDetl(@PathVariable("liftNo") Integer liftNo){
         LiftSensorDataVo vo = new LiftSensorDataVo();
-        for (ForkLiftSlave liftSlave : slaveProperties.getForkLift()) {
-            if (liftNo.equals(liftSlave.getId())) {
-                vo.setLiftNo(liftSlave.getId());
+        List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+        for (DeviceConfig device : forkliftList) {
+            if (liftNo.equals(device.getDeviceNo())) {
+                vo.setLiftNo(device.getDeviceNo());
                 // 鑾峰彇鎻愬崌鏈轰俊鎭�
-                ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, liftSlave.getId());
+                ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo());
                 if (forkLiftThread == null) {
                     return R.error("璁惧涓嶅湪绾�");
                 }

--
Gitblit v1.9.1