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 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) 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()); } -- Gitblit v1.9.1