From 2b7eb5b7c91dbf72fbfa73947d736ef2c61023a4 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期五, 21 十一月 2025 18:48:29 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 3e26b40..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,13 +271,18 @@
*/
@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