Преглед изворни кода

删除几个Controller和代码生成模板中冗余的三元表达式。

Signed-off-by: scmiot <scmiot@qq.com>
scmiot пре 2 година
родитељ
комит
9f2dc5c233

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -66,7 +66,7 @@ public class SysOssConfigController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
-        return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
+        return toAjax(iSysOssConfigService.insertByBo(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class SysOssConfigController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
-        return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
+        return toAjax(iSysOssConfigService.updateByBo(bo));
     }
 
     /**
@@ -90,7 +90,7 @@ public class SysOssConfigController extends BaseController {
     @DeleteMapping("/{ossConfigIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ossConfigIds) {
-        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
+        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true));
     }
 
     /**

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -125,7 +125,7 @@ public class SysOssController extends BaseController {
     @DeleteMapping("/{ossIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ossIds) {
-        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
+        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true));
     }
 
 }

+ 2 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -46,7 +46,7 @@ public class TestBatchController extends BaseController {
             testDemo.setValue("测试新增");
             list.add(testDemo);
         }
-        return toAjax(testDemoMapper.insertBatch(list) ? 1 : 0);
+        return toAjax(testDemoMapper.insertBatch(list));
     }
 
     /**
@@ -74,7 +74,7 @@ public class TestBatchController extends BaseController {
                 testDemo.setId(null);
             }
         }
-        return toAjax(testDemoMapper.insertOrUpdateBatch(list) ? 1 : 0);
+        return toAjax(testDemoMapper.insertOrUpdateBatch(list));
     }
 
     /**

+ 3 - 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java

@@ -119,7 +119,7 @@ public class TestDemoController extends BaseController {
         // 使用校验工具对标 @Validated(AddGroup.class) 注解
         // 用于在非 Controller 的地方校验对象
         ValidatorUtils.validate(bo, AddGroup.class);
-        return toAjax(iTestDemoService.insertByBo(bo) ? 1 : 0);
+        return toAjax(iTestDemoService.insertByBo(bo));
     }
 
     /**
@@ -130,7 +130,7 @@ public class TestDemoController extends BaseController {
     @RepeatSubmit
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
-        return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
+        return toAjax(iTestDemoService.updateByBo(bo));
     }
 
     /**
@@ -143,6 +143,6 @@ public class TestDemoController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

+ 3 - 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java

@@ -78,7 +78,7 @@ public class TestTreeController extends BaseController {
     @RepeatSubmit
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
-        return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
+        return toAjax(iTestTreeService.insertByBo(bo));
     }
 
     /**
@@ -89,7 +89,7 @@ public class TestTreeController extends BaseController {
     @RepeatSubmit
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
-        return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
+        return toAjax(iTestTreeService.updateByBo(bo));
     }
 
     /**
@@ -102,6 +102,6 @@ public class TestTreeController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+        return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

+ 3 - 3
ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -89,7 +89,7 @@ public class ${ClassName}Controller extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
-        return toAjax(i${ClassName}Service.insertByBo(bo) ? 1 : 0);
+        return toAjax(i${ClassName}Service.insertByBo(bo));
     }
 
     /**
@@ -100,7 +100,7 @@ public class ${ClassName}Controller extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
-        return toAjax(i${ClassName}Service.updateByBo(bo) ? 1 : 0);
+        return toAjax(i${ClassName}Service.updateByBo(bo));
     }
 
     /**
@@ -113,6 +113,6 @@ public class ${ClassName}Controller extends BaseController {
     @DeleteMapping("/{${pkColumn.javaField}s}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
-        return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
+        return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true));
     }
 }