From a3991c24aa69d18cad0195c28fa80abe2871bbd2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 09 十月 2025 15:09:00 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 8 +++++++-
1 files changed, 7 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..aa47680 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,6 +271,9 @@
*/
@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)) {
@@ -276,7 +282,7 @@
errorMsg = ledThread.getErrorMsg().toString();
}
}
- }
+ }
return R.ok().add(errorMsg);
}
--
Gitblit v1.9.1