From b3814333d786324bb81cca7d1bcf5ac8f2f1a7cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 23 七月 2025 08:35:33 +0800
Subject: [PATCH] 保存一个版本
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java
index 8b99a80..ee61949 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java
@@ -6,9 +6,6 @@
import com.zy.acs.common.domain.protocol.IMessageBody;
import com.zy.acs.common.enums.error.AgvErrorType;
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.VehicleFaultDto;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.*;
@@ -80,8 +77,12 @@
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));
+ if (agv_04_up.getFaultId() == 12304 && agv_04_up.getData2() == 4 && agv_04_up.getFlag() == 4) {
+ faultProcessor.reset(agvId);
+ } else {
+ // save
+ faultProcessor.execute(new VehicleFaultDto<>(protocol.getAgvNo(), protocol.getTimestamp(), agv_04_up));
+ }
// detail
String errorMSg = errorType != null ? errorType.getMsg() : agv_04_up.getHexFaultId();
@@ -89,13 +90,7 @@
detail.setErrorTime(new Date());
}
- // 鏁呴殰澶嶄綅
- if (!Cools.isEmpty(detail.realError())) {
- assert detail.getErrorTime() != null;
- if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
- detail.setError(MapDataConstant.EMPTY_OF_ERROR);
- }
- }
+
if (!agvDetailService.updateById(detail)) {
log.error("Agv [{}] 璇︽儏鏇存柊澶辫触 锛侊紒锛�", protocol.getAgvNo());
}
--
Gitblit v1.9.1