From 51d021d56d27a2873ce20612722e44ccee6e9d4c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 08:34:57 +0800
Subject: [PATCH] 错误码展示
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 2 +-
src/main/java/com/zy/core/enums/ShuttleErrorCodeType.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/ShuttleErrorCodeType.java b/src/main/java/com/zy/core/enums/ShuttleErrorCodeType.java
index bd4797d..773edb2 100644
--- a/src/main/java/com/zy/core/enums/ShuttleErrorCodeType.java
+++ b/src/main/java/com/zy/core/enums/ShuttleErrorCodeType.java
@@ -7,12 +7,12 @@
public enum ShuttleErrorCodeType {
NORMAL(0, "鏃犻敊璇�"),
- PCB_SUBMODULE(1, "PCB瀛愭ā鍧�"),
- PCB_PLATE(2, "PCB鏉�"),
- SERVO(10, "浼烘湇"),
- CANOPEN(11, "canopen"),
- RUN_ERROR(14, "杩愯閿欒"),
- SYSTEM_ERROR(16, "绯荤粺閿欒")
+ PCB_SUBMODULE(1, "PCB瀛愭ā鍧�(1)"),
+ PCB_PLATE(2, "PCB鏉�(2)"),
+ SERVO(10, "浼烘湇(10)"),
+ CANOPEN(11, "canopen(11)"),
+ RUN_ERROR(14, "杩愯閿欒(14)"),
+ SYSTEM_ERROR(16, "绯荤粺閿欒(16)")
;
public Integer id;
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 7c57f24..9cf73ce 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -337,7 +337,7 @@
BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
if (basShuttleErr == null) {
- return null;
+ return this.statusErrorCode.toString();
}
return basShuttleErr.getErrName();
}
--
Gitblit v1.9.1