From b27e55f4de22d27588033ef369048ed2e23f93b5 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 06 六月 2022 15:16:20 +0800 Subject: [PATCH] add 增加 Excel 模板导出 测试类 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 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 b2a3247..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,7 +42,7 @@ 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 @@ 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 @@ 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