From c58587c4965333eeafd7d1c00ad98bd13f6420b4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 03 十二月 2024 08:11:22 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 9 ++++
zy-acs-common/src/main/java/com/zy/acs/common/enums/error/AgvErrorType.java | 68 ++++++++++++++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java | 4 ++
zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java | 2
4 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java b/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java
index 230ea3f..512db58 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvStatusType.java
@@ -10,7 +10,7 @@
PAUSE(0x09, "瀹氭椂鏆傚仠鐘舵��"),
ROTATE(0x0A, "鏃嬭浆鏍囧畾鐘舵��"),
MOTION(0x0B, "鍙栨斁璐х姸鎬�"),
- TEMP(0x0C, "棰勭暀"),
+ TEMP(0x0C, "璐у弶鍔ㄤ綔涓�"),
LOST(0xF0, "涓㈠け鍦板潃鐮佺姸鎬�"),
IMU_ERROR(0xF1, "IMU寮傚父鐘舵��"),
ERROR(0xFF, "鏁呴殰鐘舵��"),
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/AgvErrorType.java b/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/AgvErrorType.java
index a68c8ae..6f4fbb3 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/AgvErrorType.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/enums/error/AgvErrorType.java
@@ -2,7 +2,71 @@
public enum AgvErrorType {
+ ERROR_0x0001("0001", "纭欢閿欒"),
+ ERROR_0x0002("0002", "纭欢閿欒"),
+ ERROR_0x2000("2000", "鍦伴潰鎵爜鐩告満鍑洪敊"),
+ ERROR_0x2001("2001", "寰呮満鐘舵�佷笅涓㈢爜"),
+ ERROR_0x2002("2002", "鏍″噯涓涪鐮�"),
+ ERROR_0x2003("2003", "璺緞涓涪鐮�"),
+ ERROR_0x2004("2004", "鐩磋涓涪鐮�"),
+ ERROR_0x2005("2005", "鐩磋涓敊鐮�"),
+ ERROR_0x2006("2006", "鐩磋涓㈠け缁堢偣鐮�"),
+ ERROR_0x2007("2007", "鐩磋涓棿鐮佷涪澶�"),
+ ERROR_0x2008("2008", "妫�娴嬩笉鍒拌揣浣嶇爜"),
+ ERROR_0x200B("200B", "璐т綅鐮佷笉鍖归厤"),
+ ERROR_0x2010("2010", "鐩磋浣嶇疆鍋忓樊杩囧ぇ"),
+ ERROR_0x2011("2011", "浣嶅Э铻嶅悎澶辫触杞诲害"),
+ ERROR_0x2012("2012", "浣嶅Э铻嶅悎澶辫触閲嶅害"),
+ ERROR_0x2013("2013", "瀹為檯鍦板潃鐮佷笌缁欏畾涓嶇锛岄噸鐧诲綍"),
+ ERROR_0x2014("2014", "妫�娴嬩笉鍒板湴闈㈢爜"),
+
+ ERROR_0x3001("3001", "鐩磋鍓嶈繘涓墠閬块殰闆疯揪瑙﹀彂"),
+ ERROR_0x3002("3002", "鐩磋鍓嶈繘涓墠閬块殰闆疯揪瑙﹀彂鍋滄"),
+ ERROR_0x3003("3003", "鐩磋鍚庨��涓悗閬块殰闆疯揪瑙﹀彂"),
+ ERROR_0x3004("3004", "鐩磋鍚庨��涓悗閬块殰闆疯揪瑙﹀彂鍋滄"),
+ ERROR_0x3005("3005", "閬块殰闆疯揪妯″潡鎶ヨ"),
+ ERROR_0x3006("3006", "閬块殰闆疯揪澶辫仈"),
+ ERROR_0x3010("3010", "鎬ュ仠瑙﹀彂鍜岃В闄�"),
+ ERROR_0x3011("3011", "纰版挒鏉¤Е鍙戜笌瑙ｉ櫎"),
+
+ ERROR_0x4001("4001", "浼犳劅鍣ㄤ俊鍙峰紓甯�"),
+ ERROR_0x4002("4002", "鐩告満鎺夌嚎"),
+ ERROR_0x4003("4003", "楂樺害浼犳劅鍣ㄦ帀绾�"),
+ ERROR_0x4004("4004", "璐у弶鎺у埗鍣ㄩ�氫俊寮傚父"),
+ ERROR_0x4005("4005", "鐢垫満娓╁害寮傚父"),
+ ERROR_0x4006("4006", "鐜娓╁害寮傚父"),
+
+ ERROR_0x5001("5001", "闄�铻轰华妯″潡閫氳寮傚父"),
+ ERROR_0x5003("5003", "闄�铻轰华鏁版嵁寮傚父"),
+ ERROR_0x5004("5004", "闄�铻轰华褰掗浂寮傚父"),
+ ERROR_0x5007("5007", "闄�铻轰华瑙掑害鍋忓樊杩囧ぇ锛岀揣鎬ュ仠姝�"),
+
+ ERROR_0x6001("6001", "鐢垫満鎺夌嚎"),
+ ERROR_0x6002("6002", "鐢垫満娓╁害杩囬珮"),
+ ERROR_0x6003("6003", "鐢垫満鎿嶄綔寮傚父"),
+ ERROR_0x6004("6004", "鐢垫満鎶ヨ"),
+ ERROR_0x6005("6005", "鏈煡"),
+
+ ERROR_0x7001("7001", "鐢垫睜閫氳澶辫触"),
+ ERROR_0x7002("7002", "鐢甸噺寮傚父"),
+ ERROR_0x7003("7003", "杩囧帇鎶ヨ"),
+ ERROR_0x7004("7004", "娆犲帇鎶ヨ"),
+ ERROR_0x7005("7005", "鐢垫睜娓╁害杩囬珮"),
+ ERROR_0x7006("7006", "娓╁害杩囦綆"),
+ ERROR_0x7007("7007", "鍓╀綑鐢甸噺浣�"),
+ ERROR_0x7009("7009", "鏈煡"),
+
+ ERROR_0x8001("8001", "缃戠粶妯″潡鎶ヨ"),
+ ERROR_0x8002("8002", "涓婁綅鏈洪�氫俊澶辫触"),
+ ERROR_0x8003("8003", "鏃犳晥鐨勬寚浠�"),
+ ERROR_0x8004("8004", "闈炴硶鐨勮矾寰�"),
+ ERROR_0x8005("8005", "鏈煡"),
+ ERROR_0x8006("8006", "鏈煡"),
+
+ ERROR_0x9001("9001", "鍏呯數瀵规帴浼犳劅鍣ㄥ紓甯�"),
+ ERROR_0x9002("9002", "鍏呯數瀵规帴瓒呮椂"),
+ ERROR_0x9003("9003", "瀵规帴鍚庨暱鏃堕棿鏈厖鐢�"),
;
public String sign;
@@ -25,4 +89,8 @@
return null;
}
+ public String getMsg() {
+ return "0x" + this.sign + " - " + this.desc;
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
index 153a959..d6805f7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
@@ -4,6 +4,7 @@
import com.zy.acs.common.domain.AgvProtocol;
import com.zy.acs.common.domain.protocol.*;
import com.zy.acs.common.enums.AgvStatusType;
+import com.zy.acs.common.enums.error.AgvErrorType;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
@@ -124,9 +125,15 @@
// 鏁呴殰鏁版嵁鍖�
if (msgBody instanceof AGV_04_UP) {
AGV_04_UP agv_04_up = (AGV_04_UP) msgBody;
+ AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
log.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
+
+ // save
faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
- detail.setError(agv_04_up.getHexFaultId());
+
+ // detail
+ String errorMSg = errorType != null ? errorType.getMsg() : agv_04_up.getHexFaultId();
+ detail.setError(errorMSg);
detail.setErrorTime(new Date());
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
index ea4d207..a828a67 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/FaultProcessor.java
@@ -1,6 +1,7 @@
package com.zy.acs.manager.core.service;
import com.zy.acs.common.domain.protocol.AGV_04_UP;
+import com.zy.acs.common.enums.error.AgvErrorType;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.RadixTools;
@@ -41,6 +42,8 @@
AGV_04_UP agv_04_up = dto.getT();
Date errorTime = new Date(dto.getTimestamp());
+ AgvErrorType errorType = AgvErrorType.query(agv_04_up.getHexFaultId());
+
Agv agv = agvService.selectByUuid(vehicle);
VehFaultRec vehFaultRec = new VehFaultRec();
@@ -48,6 +51,7 @@
vehFaultRec.setAgvId(agv.getId());
vehFaultRec.setFaultNo(String.valueOf(agv_04_up.getFaultId()));
vehFaultRec.setFaultHex(agv_04_up.getHexFaultId());
+ vehFaultRec.setFaultName(null != errorType ? errorType.desc : "undefined");
vehFaultRec.setFaultLev(agv_04_up.getFaultLevel());
vehFaultRec.setFaultData(GsonUtils.toJson(Cools.add("data1", agv_04_up.getData1()).add("data2", agv_04_up.getData2())));
vehFaultRec.setHappenTime(errorTime);
--
Gitblit v1.9.1