From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
index 1e7425f..4a60232 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
@@ -3,7 +3,6 @@
import cn.hutool.core.util.RandomUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +21,6 @@
* @version 3.6.0
*/
@Slf4j
-@Tag(name = "浼樺厛闃熷垪 婕旂ず妗堜緥", description = "浼樺厛闃熷垪")
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/priority")
@@ -36,16 +34,9 @@
@GetMapping("/add")
public R<Void> add(String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
- boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
+ boolean b = QueueUtils.destroyQueue(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
- // 鍒濆鍖栬缃竴娆″嵆鍙� 姝ゅ娉ㄦ剰 涓嶅厑璁哥敤鍐呴儴绫绘垨鍖垮悕绫�
- boolean flag = QueueUtils.trySetPriorityQueueComparator(queueName, new PriorityDemoComparator());
- if (flag) {
- log.info("閫氶亾: {} , 璁剧疆姣旇緝鍣ㄦ垚鍔�", queueName);
- } else {
- log.info("閫氶亾: {} , 璁剧疆姣旇緝鍣ㄥけ璐�", queueName);
- return R.fail("鎿嶄綔澶辫触");
- }
+
for (int i = 0; i < 10; i++) {
int randomNum = RandomUtil.randomInt(10);
PriorityDemo data = new PriorityDemo();
@@ -72,7 +63,7 @@
PriorityDemo data = new PriorityDemo();
data.setName(name);
data.setOrderNum(orderNum);
- if (QueueUtils.removePriorityQueueObject(queueName, data)) {
+ if (QueueUtils.removeQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
return R.fail("鎿嶄綔澶辫触");
@@ -89,7 +80,7 @@
public R<Void> get(String queueName) {
PriorityDemo data;
do {
- data = QueueUtils.getPriorityQueueObject(queueName);
+ data = QueueUtils.getQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
return R.ok("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3