From ce14b5e9fb0ac17e7e41996620ccb48b73375788 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 07 五月 2022 15:10:58 +0800
Subject: [PATCH] fix 修复 关闭短信功能 找不到bean异常问题

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 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..baec184 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,7 +1,7 @@
 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;
@@ -32,7 +32,7 @@
 
     @ApiOperation("娣诲姞闃熷垪鏁版嵁")
     @GetMapping("/add")
-    public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName) {
+    public R<Void> add(@ApiParam("闃熷垪鍚�") String queueName) {
         // 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
         boolean b = QueueUtils.destroyPriorityQueueObject(queueName);
         log.info("閫氶亾: {} , 鍒犻櫎: {}", queueName, b);
@@ -42,43 +42,47 @@
             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("鍒犻櫎闃熷垪鏁版嵁")
     @GetMapping("/remove")
-    public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
+    public R<Void> remove(@ApiParam("闃熷垪鍚�") String queueName,
                                    @ApiParam("瀵硅薄鍚�") String name,
                                    @ApiParam("鎺掑簭鍙�") Integer orderNum) {
-        PriorityDemo data = new PriorityDemo().setName(name).setOrderNum(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("鑾峰彇闃熷垪鏁版嵁")
     @GetMapping("/get")
-    public AjaxResult<Void> get(@ApiParam("闃熷垪鍚�") String queueName) {
+    public R<Void> get(@ApiParam("闃熷垪鍚�") 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