From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 832cbcf..ba6c340 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
@@ -1,11 +1,8 @@
package com.ruoyi.demo.controller.queue;
import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,15 +21,18 @@
* @version 3.6.0
*/
@Slf4j
-@Api(value = "浼樺厛闃熷垪 婕旂ず妗堜緥", tags = {"浼樺厛闃熷垪"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/priority")
public class PriorityQueueController {
- @ApiOperation("娣诲姞闃熷垪鏁版嵁")
+ /**
+ * 娣诲姞闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/add")
- public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> add(String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
@@ -42,43 +42,55 @@
log.info("閫氶亾: {} , 璁剧疆姣旇緝鍣ㄦ垚鍔�", queueName);
} else {
log.info("閫氶亾: {} , 璁剧疆姣旇緝鍣ㄥけ璐�", queueName);
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
for (int i = 0; i < 10; i++) {
int randomNum = RandomUtil.randomInt(10);
- PriorityDemo data = new PriorityDemo().setName("data-" + i).setOrderNum(randomNum);
+ PriorityDemo data = new PriorityDemo();
+ data.setName("data-" + i);
+ data.setOrderNum(randomNum);
if (QueueUtils.addPriorityQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, data);
} else {
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}, 鍙戦�佸け璐�", queueName, data);
}
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鍒犻櫎闃熷垪鏁版嵁")
+ /**
+ * 鍒犻櫎闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ * @param name 瀵硅薄鍚�
+ * @param orderNum 鎺掑簭鍙�
+ */
@GetMapping("/remove")
- public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
- @ApiParam("瀵硅薄鍚�") String name,
- @ApiParam("鎺掑簭鍙�") Integer orderNum) {
- PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(orderNum);
+ public R<Void> remove(String queueName, String name, Integer orderNum) {
+ PriorityDemo data = new PriorityDemo();
+ data.setName(name);
+ data.setOrderNum(orderNum);
if (QueueUtils.removePriorityQueueObject(queueName, data)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, data);
} else {
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鑾峰彇闃熷垪鏁版嵁")
+ /**
+ * 鑾峰彇闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/get")
- public AjaxResult<Void> get(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> get(String queueName) {
PriorityDemo data;
do {
data = QueueUtils.getPriorityQueueObject(queueName);
log.info("閫氶亾: {} , 鑾峰彇鏁版嵁: {}", queueName, data);
} while (data != null);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3