From 7a0edfcd4fe0d82a66f8be2c3f894505d544feda Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 07 五月 2025 10:45:14 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/DevopsController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java
index 863c2d2..115bc3f 100644
--- a/src/main/java/com/zy/asrs/controller/DevopsController.java
+++ b/src/main/java/com/zy/asrs/controller/DevopsController.java
@@ -75,11 +75,11 @@
List<ErrorType> staError = isStaError(staProtocol, wrkMast);
for (ErrorType type : staError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
- devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
- devopsMessage.setMethod(devopsMessage.getMethod() + ";" + type.getMethod());
+ devopsMessage.setError(devopsMessage.getError() + "\n" + type.getDesc());
+ devopsMessage.setMethod(devopsMessage.getMethod() + "\n" + type.getMethod());
} else {
- devopsMessage.setError(type.getDesc());
- devopsMessage.setMethod(type.getMethod());
+ devopsMessage.setError(type.getDesc()+ ";");
+ devopsMessage.setMethod(type.getMethod()+ ";" );
}
}
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
@@ -87,11 +87,11 @@
List<ErrorType> crnError = isCrnError(crnProtocol, wrkMast);
for (ErrorType type : crnError) {
if (!Cools.isEmpty(devopsMessage.getError())) {
- devopsMessage.setError(devopsMessage.getError() + ";" + type.getDesc());
- devopsMessage.setMethod(devopsMessage.getMethod() + ";" + type.getMethod());
+ devopsMessage.setError(devopsMessage.getError() + "\n" + type.getDesc());
+ devopsMessage.setMethod(devopsMessage.getMethod() + "\n" + type.getMethod());
} else {
- devopsMessage.setError(type.getDesc());
- devopsMessage.setMethod(type.getMethod());
+ devopsMessage.setError(type.getDesc()+ ";");
+ devopsMessage.setMethod(type.getMethod()+ ";");
}
}
devopsMessages.add(devopsMessage);
--
Gitblit v1.9.1