From e18cf51c0170490c80bb9b7c794f6f4ed1fad938 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 30 四月 2022 22:21:49 +0800 Subject: [PATCH] update 优化 RedisUtils 重构过期方法 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index 3981717..d1f994e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -5,7 +5,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.validate.AddGroup; @@ -75,12 +75,12 @@ @Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.IMPORT) @SaCheckPermission("demo:demo:import") @PostMapping("/importData") - public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file) throws Exception { + public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception { ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); List<TestDemoImportVo> volist = excelResult.getList(); List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class); iTestDemoService.saveBatch(list); - return AjaxResult.success(excelResult.getAnalysis()); + return R.ok(excelResult.getAnalysis()); } /** @@ -105,10 +105,10 @@ @ApiOperation("鑾峰彇娴嬭瘯鍗曡〃璇︾粏淇℃伅") @SaCheckPermission("demo:demo:query") @GetMapping("/{id}") - public AjaxResult<TestDemoVo> getInfo(@ApiParam("娴嬭瘯ID") + public R<TestDemoVo> getInfo(@ApiParam("娴嬭瘯ID") @NotNull(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable("id") Long id) { - return AjaxResult.success(iTestDemoService.queryById(id)); + return R.ok(iTestDemoService.queryById(id)); } /** @@ -117,9 +117,9 @@ @ApiOperation("鏂板娴嬭瘯鍗曡〃") @SaCheckPermission("demo:demo:add") @Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.INSERT) - @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "涓嶅厑璁搁噸澶嶆彁浜�") + @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}") @PostMapping() - public AjaxResult<Void> add(@RequestBody TestDemoBo bo) { + public R<Void> add(@RequestBody TestDemoBo bo) { // 浣跨敤鏍¢獙宸ュ叿瀵规爣 @Validated(AddGroup.class) 娉ㄨВ // 鐢ㄤ簬鍦ㄩ潪 Controller 鐨勫湴鏂规牎楠屽璞� ValidatorUtils.validate(bo, AddGroup.class); @@ -134,7 +134,7 @@ @Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.UPDATE) @RepeatSubmit @PutMapping() - public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { + public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0); } @@ -145,7 +145,7 @@ @SaCheckPermission("demo:demo:remove") @Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult<Void> remove(@ApiParam("娴嬭瘯ID涓�") + public R<Void> remove(@ApiParam("娴嬭瘯ID涓�") @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable Long[] ids) { return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); -- Gitblit v1.9.3