From e32ff68be04c9e2e3ab689c4494aefe5d3036400 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 6 +++---
1 files changed, 3 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 872f214..8f7ff4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -79,7 +79,7 @@
public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
Integer ledId = 0;
for (LedSlave led : slaveProperties.getLed()) {
- for (Integer staNo : led.getStaArr()) {
+ for (Integer staNo : led.getInStaArr()) {
if (staNo.equals(sta)) {
ledId = led.getId();
break;
@@ -268,7 +268,7 @@
String ledContent = "";
List<LedCommand> commandList = null;
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
ledContent = ledThread.getStringBuffer().toString();
@@ -286,7 +286,7 @@
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
errorMsg = ledThread.getErrorMsg().toString();
--
Gitblit v1.9.1