xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整返回类型为 R

Browse Source
This commit is contained in:
疯狂的狮子li
2022-01-29 11:48:41 +08:00
parent eb87229ee9
commit 53da7140c2
38 changed files with 412 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
+9 -9
View File
@@ -1,6 +1,6 @@
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;
@@ -32,7 +32,7 @@ public class BoundedQueueController {
@ApiOperation("添加队列数据")
@GetMapping("/add")
public AjaxResult<Void> add(@ApiParam("队列名") String queueName,
public R<Void> add(@ApiParam("队列名") String queueName,
@ApiParam("容量") int capacity) {
// 用完了一定要销毁 否则会一直存在
boolean b = QueueUtils.destroyBoundedQueueObject(queueName);
@@ -42,7 +42,7 @@ public class BoundedQueueController {
log.info("通道: {} , 设置容量: {}", queueName, capacity);
} else {
log.info("通道: {} , 设置容量失败", queueName);
return AjaxResult.error("操作失败");
return R.fail("操作失败");
}
for (int i = 0; i < 11; i++) {
String data = "data-" + i;
@@ -53,30 +53,30 @@ public class BoundedQueueController {
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) {
String data = "data-" + 5;
if (QueueUtils.removeBoundedQueueObject(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) {
String data;
do {
data = QueueUtils.getBoundedQueueObject(queueName);
log.info("通道: {} , 获取数据: {}", queueName, data);
} while (data != null);
return AjaxResult.success("操作成功");
return R.ok("操作成功");
}
}
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
+10 -10
View File
@@ -1,6 +1,6 @@
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;
@@ -34,45 +34,45 @@ 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("操作成功");
}
}
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
+9 -9
View File
@@ -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 @@ public class PriorityQueueController {
@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,7 +42,7 @@ public class PriorityQueueController {
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);
@@ -55,12 +55,12 @@ public class PriorityQueueController {
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();
@@ -69,20 +69,20 @@ public class PriorityQueueController {
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("操作成功");
}
}