From 590a64af2cdd33427ed8eda2eb983b07dd60ab8b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 16 一月 2026 12:05:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 4918fd8..ed9cf97 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
@@ -84,9 +84,10 @@
AGV_12_UP agv_12_up = (AGV_12_UP) msgBody;
// unlock path
- threadPoolRegulator.getInstance().execute(() -> {
- mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
- });
+ mapService.unlockPath(protocol.getAgvNo(), agv_12_up.getQrCode());
+// threadPoolRegulator.getInstance().execute(() -> {
+//
+// });
// finish jam
threadPoolRegulator.getInstance().execute(() -> jamService.checkIfFinish(agvId, agv_12_up.getQrCode()));
@@ -133,13 +134,13 @@
// detail
String errorMSg = errorType != null ? errorType.getMsg() : agv_04_up.getHexFaultId();
detail.setError(errorMSg);
- detail.setErrorTime(new Date());
+ detail.setErrorTime(now);
}
// 鏁呴殰澶嶄綅
if (!Cools.isEmpty(detail.realError())) {
assert detail.getErrorTime() != null;
- if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
+ if (DateUtils.diffToSeconds(detail.getErrorTime(), now) > 10) {
detail.setError(MapDataConstant.EMPTY_OF_ERROR);
}
}
@@ -153,7 +154,7 @@
private void sync(AGV_12_UP mesBody, AgvDetail detail) {
detail.setStatus(mesBody.getStatus());
- Code code = codeService.selectByData(mesBody.getQrCode());
+ Code code = codeService.getCacheByData(mesBody.getQrCode());
if (null != code) {
detail.setCode(code.getId());
detail.setLastCode(null);
@@ -201,7 +202,7 @@
private void sync(AGV_13_UP mesBody, AgvDetail detail) {
detail.setStatus(mesBody.getStatus());
- Code code = codeService.selectByData(mesBody.getQrCode());
+ Code code = codeService.getCacheByData(mesBody.getQrCode());
if (null != code) {
if (!detail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
--
Gitblit v1.9.1