From 32efe67e5c2ce1419d91717232f5b881b1828bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 六月 2024 09:30:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 2355664..74a38d8 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -106,7 +106,7 @@
continue;
}
if (rgvProtocol.getAlarm() > 0){
- msg.append("<span style=\"color: red\">").append(rgv.getId()).append("鍙稲gv鎶ヨ<span>\br");
+ msg.append("<span style=\"color: red\">").append(rgv.getId()).append("鍙稲gv鎶ヨ<span><br>");
}
}
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -116,15 +116,14 @@
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (entry.getKey() == 302 || entry.getKey() == 303 || entry.getKey() == 304 || entry.getKey() == 305) {
if (!Cools.isEmpty(staPlcErr(entry))){
- msg.append(staPlcErr(entry).get(0));
- msg.append("<span style=\"color: red\">").append(staPlcErr(entry).get(0).getNo()).append("鍙锋彁鍗囨満鎶ヨ<span>\br");
+ msg.append("<span style=\"color: red\">").append(staPlcErr(entry).get(0).getNo()).append("鍙锋彁鍗囨満鎶ヨ<span><br>");
}
}
}
}
- if (Cools.isEmpty(msg)){
+ if (!Cools.isEmpty(msg)){
return R.error().add(msg.toString());
}
return R.ok();
--
Gitblit v1.9.1