From e82ebf78cdc2b0c0579f8bc00f9956ce4f76bffc Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 13:11:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/cache/TaskProtocolCache.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/cache/TaskProtocolCache.java b/src/main/java/com/zy/core/cache/TaskProtocolCache.java
index e17f307..f4d7519 100644
--- a/src/main/java/com/zy/core/cache/TaskProtocolCache.java
+++ b/src/main/java/com/zy/core/cache/TaskProtocolCache.java
@@ -15,7 +15,7 @@
@Slf4j
public class TaskProtocolCache {
// 鏈湴缂撳瓨锛岄敭涓� taskNo锛屽�间负 TaskProtocol
- private final ConcurrentHashMap<Long, TaskProtocol> cache = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<String, TaskProtocol> cache = new ConcurrentHashMap<>();
// 璇诲啓閿侊紝纭繚绾跨▼瀹夊叏
// private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -24,28 +24,16 @@
* 鏇存柊璁惧鐘舵��
*/
public void updateTaskProtocol(TaskProtocol status) {
- cache.put(status.getTaskNo(), status);
+ cache.put(status.getTaskNoDirection(), status);
}
/**
* 鍒犻櫎浠诲姟缂撳瓨
*/
- public TaskProtocol removeTaskProtocol(String taskNo) {
+ public TaskProtocol removeTaskProtocol(String taskNoDirection) {
// lock.readLock().lock(); // 鍔犺閿�
try {
- return cache.remove(taskNo);
- } finally {
-// lock.readLock().unlock(); // 閲婃斁璇婚攣
- }
- }
-
- /**
- * 鑾峰彇浠诲姟缂撳瓨
- */
- public TaskProtocol getTaskProtocol(String taskNo) {
-// lock.readLock().lock(); // 鍔犺閿�
- try {
- return cache.get(taskNo);
+ return cache.remove(taskNoDirection);
} finally {
// lock.readLock().unlock(); // 閲婃斁璇婚攣
}
@@ -54,13 +42,25 @@
/**
* 鑾峰彇鎵�鏈変换鍔�
*/
- public ConcurrentHashMap<Long, TaskProtocol> getAllTaskProtocol() {
+ public ConcurrentHashMap<String, TaskProtocol> getAllTaskProtocol() {
// lock.readLock().lock(); // 鍔犺閿�
try {
return new ConcurrentHashMap<>(cache); // 杩斿洖鍓湰
} finally {
// lock.readLock().unlock(); // 閲婃斁璇婚攣
}
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夊彇浠诲姟
+ */
+ public List<TaskProtocol> getTakeOrPutTaskProtocol(short loaded) {
+ if (loaded == 0){
+ return getAllTakeTaskProtocol();
+ } else if (loaded == 1){
+ return getAllPutTaskProtocol();
+ }
+ return new ArrayList<>();
}
/**
@@ -82,7 +82,7 @@
}
/**
- * 鑾峰彇鎵�鏈夊彇浠诲姟
+ * 鑾峰彇鎵�鏈夋斁浠诲姟
*/
public List<TaskProtocol> getAllPutTaskProtocol() {
// lock.readLock().lock(); // 鍔犺閿�
@@ -100,7 +100,7 @@
}
/**
- * 鑾峰彇鎵�鏈夊彇浠诲姟
+ * 鑾峰彇鎵�鏈夎璧颁换鍔�
*/
public List<TaskProtocol> getAllWalkTaskProtocol() {
// lock.readLock().lock(); // 鍔犺閿�
--
Gitblit v1.9.1