From 649f2e387786c86e248a8e031979c3fb67a5e39d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 20 八月 2024 14:43:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/ErrMsg.java | 9 +++++++++
src/main/java/com/zy/core/thread/LedThread.java | 9 +++++----
src/main/java/com/zy/asrs/controller/MonitorController.java | 3 ++-
3 files changed, 16 insertions(+), 5 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..17f7714 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;
@@ -158,7 +159,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());
}
}
}
diff --git a/src/main/java/com/zy/core/model/ErrMsg.java b/src/main/java/com/zy/core/model/ErrMsg.java
new file mode 100644
index 0000000..aa2938f
--- /dev/null
+++ b/src/main/java/com/zy/core/model/ErrMsg.java
@@ -0,0 +1,9 @@
+package com.zy.core.model;
+
+import lombok.Data;
+
+@Data
+public class ErrMsg {
+ private String errMsg;
+ private String area;
+}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 36e9753..9beff2f 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -5,6 +5,7 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.ErrMsg;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
import lombok.Data;
@@ -44,7 +45,7 @@
private List<LedCommand> commandList;
// private StringBuffer errorMsg = new StringBuffer();
- private Map<String,String> errorMsg = new LinkedHashMap<>();
+ private List<ErrMsg> errorMsg = new ArrayList<>();
public LedThread(Slave slave) {
this.slave = slave;
@@ -84,7 +85,7 @@
reset7();
break;
case 5:
- error((Map<String,String>) task.getData());
+ error((ErrMsg)task.getData());
break;
case 6:
errorReset();
@@ -228,9 +229,9 @@
}
- private void error(Map<String,String> msg) {
+ private void error(ErrMsg errMsg) {
errorMsg.clear();
- errorMsg.putAll(msg);
+ errorMsg.add(errMsg);
}
public void errorReset() {
--
Gitblit v1.9.1