From df968a12b712ea472c3dff384953a77724449dc6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 16 十月 2025 16:52:09 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index aa47680..bf23567 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -271,16 +271,18 @@
*/
@GetMapping("/led/error")
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
- if (ledId == 1005){
- return null;
- }
+// 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