From 746b1998b7b948e56bcda268aadc154371fb4fcd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 十一月 2024 14:26:21 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 13 ++++++++++++-
1 files changed, 12 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 f3c07bb..7fc2714 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
@@ -7,7 +7,9 @@
import com.zy.acs.common.utils.GsonUtils;
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.domain.BackpackDto;
+import com.zy.acs.manager.core.domain.VehicleFaultDto;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -122,9 +124,18 @@
if (msgBody instanceof AGV_04_UP) {
AGV_04_UP agv_04_up = (AGV_04_UP) msgBody;
log.info("Agv [{}] 鏁呴殰鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_04_up));
-// faultProcessor.execute(new VehicleFaultDto());
+ faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
+ detail.setError(String.valueOf(agv_04_up.getFaultId()));
+ detail.setErrorTime(new Date());
}
+ // 鏁呴殰澶嶄綅
+ if (!Cools.isEmpty(detail.getError()) && !"NONE".equals(detail.getError())) {
+ assert detail.getErrorTime() != null;
+ if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
+ detail.setError("NONE");
+ }
+ }
if (!agvDetailService.updateById(detail)) {
log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
}
--
Gitblit v1.9.1