From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
index 77ee268..e6dbee8 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
@@ -1,10 +1,7 @@
package com.ruoyi.demo.controller.queue;
-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;
@@ -26,53 +23,68 @@
* @version 3.6.0
*/
@Slf4j
-@Api(value = "寤惰繜闃熷垪 婕旂ず妗堜緥", tags = {"寤惰繜闃熷垪"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/delayed")
public class DelayedQueueController {
- @ApiOperation("璁㈤槄闃熷垪")
+ /**
+ * 璁㈤槄闃熷垪
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/subscribe")
- public AjaxResult<Void> subscribe(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> subscribe(String queueName) {
log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
// 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
// 瑙傚療鎺ユ敹鏃堕棿
log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, orderNum);
});
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("娣诲姞闃熷垪鏁版嵁")
+ /**
+ * 娣诲姞闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ * @param orderNum 璁㈠崟鍙�
+ * @param time 寤惰繜鏃堕棿(绉�)
+ */
@GetMapping("/add")
- public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName,
- @ApiParam("璁㈠崟鍙�") String orderNum,
- @ApiParam("寤惰繜鏃堕棿(绉�)") Long time) {
+ public R<Void> add(String queueName, String orderNum, Long time) {
QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
// 瑙傚療鍙戦�佹椂闂�
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, orderNum);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("鍒犻櫎闃熷垪鏁版嵁")
+ /**
+ * 鍒犻櫎闃熷垪鏁版嵁
+ *
+ * @param queueName 闃熷垪鍚�
+ * @param orderNum 璁㈠崟鍙�
+ */
@GetMapping("/remove")
- public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
- @ApiParam("璁㈠崟鍙�") String orderNum) {
+ public R<Void> remove(String queueName, String orderNum) {
if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, orderNum);
} else {
- return AjaxResult.error("鎿嶄綔澶辫触");
+ return R.fail("鎿嶄綔澶辫触");
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
- @ApiOperation("閿�姣侀槦鍒�")
+ /**
+ * 閿�姣侀槦鍒�
+ *
+ * @param queueName 闃熷垪鍚�
+ */
@GetMapping("/destroy")
- public AjaxResult<Void> destroy(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> destroy(String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
QueueUtils.destroyDelayedQueue(queueName);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3