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/AgvDataNoCodeService.java | 10 ++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 9 +++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataErrorService.java | 8 +-------
3 files changed, 20 insertions(+), 7 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..c7f16ed 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
@@ -89,13 +89,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());
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataNoCodeService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataNoCodeService.java
index 9323003..41372de 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataNoCodeService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataNoCodeService.java
@@ -7,6 +7,9 @@
import com.zy.acs.common.enums.AgvStatusType;
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.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -87,6 +90,13 @@
}
}
+ // 鏁呴殰澶嶄綅
+ 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());
}
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 1f809b8..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
@@ -7,6 +7,8 @@
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.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -94,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());
--
Gitblit v1.9.1