From 13ea8b334572c2423abb8d156fd8428f8d074172 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 08:24:58 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 13 ++++++-------
1 files changed, 6 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..c14ca71 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
@@ -44,8 +44,6 @@
@Autowired
private WebsocketService websocketService;
@Autowired
- private TrafficService trafficService;
- @Autowired
private MapService mapService;
@Autowired
private ThreadPoolRegulator threadPoolRegulator;
@@ -84,9 +82,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()));
@@ -153,7 +152,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 +200,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