From b8e32099c3d0542a966f9bf0d24bfec73cc13882 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 30 五月 2025 10:59:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 5 ++++-
1 files changed, 4 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 a827610..6110bc5 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
@@ -12,6 +13,7 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.ErrMsg;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
@@ -158,7 +160,7 @@
if (slave.getStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
- errorMsg = ledThread.getErrorMsg().toString();
+ errorMsg = JSONObject.toJSONString(ledThread.getErrorMsg());
}
}
}
@@ -267,6 +269,7 @@
public R monitorLed(@RequestParam("ledId") Integer ledId) {
String ledContent = "";
List<LedCommand> commandList = null;
+ List<ErrMsg> errMsgs = null;
for (LedSlave slave : slaveProperties.getLed()) {
if (slave.getStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
--
Gitblit v1.9.1