From 2847834c330019b88536c44df1e1f8185344688b Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期三, 12 十一月 2025 16:55:12 +0800
Subject: [PATCH] 调试

---
 src/main/java/com/zy/asrs/controller/MonitorController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 35e0eae..bf23567 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -249,6 +249,9 @@
      */
     @GetMapping("/led")
     public R monitorLed(@RequestParam("ledId") Integer ledId) {
+        if (ledId == 1005){
+            return null;
+        }
         String ledContent = "";
         List<LedCommand> commandList = null;
         for (LedSlave slave : slaveProperties.getLed()) {
@@ -268,15 +271,20 @@
      */
     @GetMapping("/led/error")
     public R monitorLedError(@RequestParam("ledId") Integer ledId) {
+//        if (ledId == 1005){
+//            return null;
+//        }
         String errorMsg = "";
         for (LedSlave slave : slaveProperties.getLed()) {
             if (slave.getStaArr().contains(ledId)) {
                 LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                 if (null != ledThread) {
                     errorMsg = ledThread.getErrorMsg().toString();
+                    return R.ok().add(errorMsg);
                 }
+                return R.ok().add(errorMsg);
             }
-        }
+         }
         return R.ok().add(errorMsg);
     }
 

--
Gitblit v1.9.1