From 98418272abb98cf5711c689568e63b1389383d97 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 05 三月 2022 00:18:15 +0800
Subject: [PATCH] !148 fix 修复Oracle代码生成器空值更新报错问题 Merge pull request !148 from Yjoioooo/auto-5403234-dev-1646410371975
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 f81765b..f877753 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,13 +1,12 @@
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,52 +27,52 @@
*/
@Slf4j
@Api(value = "寤惰繜闃熷垪 婕旂ず妗堜緥", tags = {"寤惰繜闃熷垪"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/queue/delayed")
public class DelayedQueueController {
@ApiOperation("璁㈤槄闃熷垪")
@GetMapping("/subscribe")
- public AjaxResult<Void> subscribe(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> subscribe(@ApiParam("闃熷垪鍚�") String queueName) {
log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
// 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
// 瑙傚療鎺ユ敹鏃堕棿
log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, orderNum);
});
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
@ApiOperation("娣诲姞闃熷垪鏁版嵁")
@GetMapping("/add")
- public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName,
+ public R<Void> add(@ApiParam("闃熷垪鍚�") String queueName,
@ApiParam("璁㈠崟鍙�") String orderNum,
@ApiParam("寤惰繜鏃堕棿(绉�)") Long time) {
QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
// 瑙傚療鍙戦�佹椂闂�
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, orderNum);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
@ApiOperation("鍒犻櫎闃熷垪鏁版嵁")
@GetMapping("/remove")
- public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
+ public R<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
@ApiParam("璁㈠崟鍙�") 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("閿�姣侀槦鍒�")
@GetMapping("/destroy")
- public AjaxResult<Void> destroy(@ApiParam("闃熷垪鍚�") String queueName) {
+ public R<Void> destroy(@ApiParam("闃熷垪鍚�") String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
QueueUtils.destroyDelayedQueue(queueName);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3