xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 16:23:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!242 优化调用toAjax时的冗余三元操作符。

Browse Source 
Merge pull request !242 from scmiot/dev
This commit is contained in:
疯狂的狮子Li
2022-10-29 09:35:25 +00:00
committed by Gitee
parent ec076c1e0d 9f2dc5c233
commit 5830c3c96d
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
View File

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

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
View File

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

4
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
View File

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

6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

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

6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
View File

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

6
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@@ -89,7 +89,7 @@ public class ${ClassName}Controller extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) { 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() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) { 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}") @DeleteMapping("/{${pkColumn.javaField}s}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { @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));
} }
} }