From 9483baffba9a24a2a36fc8739fc65b59317d9142 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 03 七月 2025 14:18:46 +0800 Subject: [PATCH] 队列拆分 --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 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 56cfc33..c9d1c32 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 @@ -2,16 +2,14 @@ import com.alibaba.fastjson.JSON; 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.domain.protocol.AGV_12_UP; +import com.zy.acs.common.domain.protocol.IMessageBody; 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.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.AgvDetail; import com.zy.acs.manager.manager.entity.Code; import com.zy.acs.manager.manager.service.*; @@ -98,6 +96,13 @@ log.info("Agv [{}] 鏈夌爜瀹炴椂鏁版嵁鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_12_up)); } } + // 鏁呴殰澶嶄綅 + 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()); @@ -152,7 +157,6 @@ detail.setBackpack(GsonUtils.toJson(backpackDtoList)); } - } -- Gitblit v1.9.1