From 4a85867e626a0642172ca3425c9eb718a683f311 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 14 二月 2025 16:57:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 50 +++++++-------------------------------------------
1 files changed, 7 insertions(+), 43 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 9dd818d..ee9e9fd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -50,10 +50,8 @@
}};
private List<String> CONVEYOR_PICK_CODE_DATA_CACHE = new ArrayList<String>(){{
- add("00000246");
+ add("00000146");
}};
-
- private Map<String, JobType> agvJobMap = new ConcurrentHashMap<>();
@Autowired
private AgvService agvService;
@@ -89,9 +87,9 @@
return;
}
- JobType jobType = this.agvJobMap.get(agvNo);
+ JobType jobType = CoreCache.AGV_MOCK_JOB_CACHE.get(agvNo);
if (null == jobType) {
- this.agvJobMap.put(agvNo, JobType.LOC_PICK);
+ CoreCache.AGV_MOCK_JOB_CACHE.put(agvNo, JobType.LOC_PICK);
CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, 0);
jobType = JobType.LOC_PICK;
}
@@ -130,40 +128,6 @@
log.info( "{}寮�濮嬩綔涓氭紨绀�...", agvNo);
CoreCache.AGV_MOCK_STEP_CACHE.put(agvId, CodeStepDto.build(destinationCodeData, jobType));
- switch (jobType) {
- case LOC_PICK:
- Integer usedSlotsByLocPick = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
- usedSlotsByLocPick++;
-
- if (Objects.equals(agvModelService.getByAgvId(agvId).getBackpack(), usedSlotsByLocPick)) {
- this.agvJobMap.put(agvNo, JobType.CONVEYOR_DROP);
- } else {
- CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, usedSlotsByLocPick);
- }
- break;
- case CONVEYOR_DROP:
- CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, 0);
-
- this.agvJobMap.put(agvNo, JobType.CONVEYOR_PICK);
- break;
- case CONVEYOR_PICK:
- CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, agvModelService.getByAgvId(agvId).getBackpack());
-
- this.agvJobMap.put(agvNo, JobType.LOCK_DROP);
- break;
- case LOCK_DROP:
- Integer usedSlotsByLocDrop = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
- usedSlotsByLocDrop--;
-
- if (usedSlotsByLocDrop == 0) {
- this.agvJobMap.put(agvNo, JobType.LOC_PICK);
- } else {
- CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, usedSlotsByLocDrop);
- }
- break;
- default:
- break;
- }
}
}
@@ -293,8 +257,8 @@
Runnable patrolTask = () -> {
try {
-// executePatrolLogic(agvNo);
- executeUShapeConveyor(agvNo);
+ executePatrolLogic(agvNo);
+// executeUShapeConveyor(agvNo);
} catch (Exception e) {
log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�: {}", agvNo, e.getMessage());
}
@@ -320,8 +284,8 @@
AGV_PATROL_MAP.remove(agvNo);
CoreCache.AGV_BACKPACK_USED_CACHE.remove(agvId);
CoreCache.AGV_MOCK_STEP_CACHE.remove(agvId);
- this.agvJobMap.remove(agvNo);
- log.info("宸插仠姝GV " + agvNo + " 鐨勮窇搴撲换鍔°��");
+ CoreCache.AGV_MOCK_JOB_CACHE.remove(agvNo);
+ log.info("宸插仠姝GV {} 鐨勮窇搴撲换鍔°��", agvNo);
return R.ok("宸插仠姝GV " + agvNo + " 鐨勮窇搴撲换鍔°��");
} else {
log.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
--
Gitblit v1.9.1