From ac0ba5423f9d0206d5a637ed8338e80d37333972 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 十一月 2024 15:19:26 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 9f4521a..153a959 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
@@ -8,6 +8,7 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.DateUtils;
+import com.zy.acs.manager.core.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.domain.VehicleFaultDto;
import com.zy.acs.manager.manager.entity.Agv;
@@ -125,15 +126,15 @@
AGV_04_UP agv_04_up = (AGV_04_UP) msgBody;
log.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
- detail.setError(String.valueOf(agv_04_up.getFaultId()));
+ detail.setError(agv_04_up.getHexFaultId());
detail.setErrorTime(new Date());
}
// 鏁呴殰澶嶄綅
- if (!Cools.isEmpty(detail.getError())) {
+ if (!Cools.isEmpty(detail.realError())) {
assert detail.getErrorTime() != null;
if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
- detail.setError("NONE");
+ detail.setError(MapDataConstant.EMPTY_OF_ERROR);
}
}
if (!agvDetailService.updateById(detail)) {
--
Gitblit v1.9.1