From 1c06b5c81f4187f1e9b7f4e5aa96a563637c6c12 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 20:30:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/TVController.java |   67 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index bdaeea5..540d1d5 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -23,6 +23,7 @@
 import com.zy.common.model.SearchLocParam;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.RedisUtil;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.LedSlave;
@@ -33,6 +34,7 @@
 import com.zy.core.thread.LedThread;
 import com.zy.core.thread.ShuttleThread;
 import com.zy.core.thread.impl.NormalLedThread;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +49,7 @@
 /**
  * Created by vincent on 2020/11/16
  */
+@Slf4j
 @RestController
 @RequestMapping("/monitor")
 public class TVController {
@@ -66,6 +69,9 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private BasShuttleErrService basShuttleErrService;
+
+    @Autowired
+    private RedisUtil redisUtil;
     @Value("${asrs.wmsUrl}")
     private String wmsUrl;
 
@@ -225,45 +231,40 @@
      */
     @GetMapping("/led")
     public R monitorLed(@RequestParam("ledId") Integer ledId) {
-        int dev_no = 1011;
+        int dev_no1 = 1011;
+        int dev_no2 = 1012;
+        int dev_no3 = 1015;
         if (ledId == 1) {
-            dev_no = 1011;
+            dev_no1 = 1011;
+            dev_no2 = 1012;
         } else if (ledId == 2) {
-            dev_no = 1014;
+            dev_no1 = 1013;
+            dev_no2 = 1014;
+            dev_no3 = 1015;
         } else if (ledId == 3) {
-            dev_no = 1021;
+            dev_no1 = 1021;
+            dev_no2 = 1022;
+            dev_no3 = 1023;
         } else if (ledId == 4) {
-            dev_no = 1025;
+            dev_no1 = 1024;
+            dev_no2 = 1025;
+            dev_no3 = 1026;
         }
-        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", dev_no));
-        if (Cools.isEmpty(basDevp)) {
-            return R.ok();
+        Object o1 = redisUtil.get("LED_" + dev_no1);
+        Object o2 = redisUtil.get("LED_" + dev_no2);
+        Object o3 = redisUtil.get("LED_" + dev_no3);
+        if (o1 != null) {
+            log.info("鐢佃鏈烘樉绀�1锛歿}", JSONObject.toJSONString(o1));
+            return R.ok().add(o1);
+        } else if (o2 != null) {
+            log.info("鐢佃鏈烘樉绀�2锛歿}", JSONObject.toJSONString(o2));
+            return R.ok().add(o2);
+        } else if (o3 != null) {
+            log.info("鐢佃鏈烘樉绀�3锛歿}", JSONObject.toJSONString(o3));
+            return R.ok().add(o3);
         }
-        if (Cools.isEmpty(basDevp.getWrkNo1())) {
-            return R.ok();
-        }
-        List<LedCommand> commands = new ArrayList<>();
-        Map<String, Object> param = new HashMap<>();
-        param.put("taskNo", basDevp.getWrkNo1());
-        String response = null;
-        try {
-            response = new HttpHandler.Builder()
-                    .setUri(wmsUrl)
-                    .setPath("/rpc/led/getTask2")
-                    .setJson(JSON.toJSONString(param))
-                    .build()
-                    .doPost();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        JSONObject jsonObject = JSON.parseObject(response);
-        Integer code = jsonObject.getInteger("code");
-        if (code.equals(200)) {
-            String data = jsonObject.getString("data");
-            List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
-            commands.addAll(wrkDetls);
-        }
-        return R.ok().add(commands);
+        return R.ok();
+
     }
 
     /**

--
Gitblit v1.9.1