From db9da52e04e95cf0b3c4f196ce5e1baf7a58832d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 19 十二月 2025 16:49:20 +0800
Subject: [PATCH] led相关功能完善
---
src/main/java/com/zy/controller/MonitorController.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/controller/MonitorController.java b/src/main/java/com/zy/controller/MonitorController.java
index e566421..b54a038 100644
--- a/src/main/java/com/zy/controller/MonitorController.java
+++ b/src/main/java/com/zy/controller/MonitorController.java
@@ -75,13 +75,16 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") String ledIdString) {
Integer ledId = 0;
- for (LedSlave led : slaveProperties.getLed()) {
- for (Integer staNo : led.getStaArr()) {
- if (staNo.equals(sta)) {
- ledId = led.getId();
- break;
+ String[] ledIds = ledIdString.split(",");
+ for (String id : ledIds) {
+ for (LedSlave led : slaveProperties.getLed()) {
+ for (Integer staNo : led.getStaArr()) {
+ if (staNo.equals(Integer.parseInt(id))) {
+ ledId = led.getId();
+ break;
+ }
}
}
}
@@ -261,18 +264,23 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/led")
- public R monitorLed(@RequestParam("ledId") Integer ledId) {
+ public R monitorLed(@RequestParam("ledId") String ledIdString) {
+ String[] ledIds = ledIdString.split(",");
String ledContent = "";
List<LedCommand> commandList = null;
- for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
- if (null != ledThread) {
- ledContent = ledThread.getStringBuffer().toString();
- commandList = ledThread.getCommandList();
+ for(String ledId: ledIds) {
+
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(Integer.parseInt(ledId))) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ ledContent = ledThread.getStringBuffer().toString();
+ commandList = ledThread.getCommandList();
+ }
}
}
}
+
return R.ok().add(commandList);
}
@@ -280,13 +288,16 @@
* 寮傚父閫氱煡
*/
@GetMapping("/led/error")
- public R monitorLedError(@RequestParam("ledId") Integer ledId) {
+ public R monitorLedError(@RequestParam("ledId") String ledIdString) {
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();
+ String[] ledIds = ledIdString.split(",");
+ for(String ledId: ledIds) {
+ for (LedSlave slave : slaveProperties.getLed()) {
+ if (slave.getStaArr().contains(Integer.parseInt(ledId))) {
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
+ if (null != ledThread) {
+ errorMsg = ledThread.getErrorMsg().toString();
+ }
}
}
}
--
Gitblit v1.9.1