DeXun/xgy-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 将响应体R改回AjaxResult，方便兼容RuoYi-Vue-Plus的同步更新

Browse Source
This commit is contained in:
hewenqiang
2022-01-28 15:30:37 +08:00
parent fe3907e95b
commit 47539482b4
46 changed files with 457 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
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.R;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
@@ -48,9 +48,9 @@ public class TestTreeController extends BaseController {
@ApiOperation("查询测试树表列表")
@SaCheckPermission("demo:tree:list")
@GetMapping("/list")
public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo);
return R.success(list);
return AjaxResult.success(list);
}
/**
@@ -71,10 +71,10 @@ public class TestTreeController extends BaseController {
@ApiOperation("获取测试树表详细信息")
@SaCheckPermission("demo:tree:query")
@GetMapping("/{id}")
public R<TestTreeVo> getInfo(@ApiParam("测试树ID")
public AjaxResult<TestTreeVo> getInfo(@ApiParam("测试树ID")
@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.success(iTestTreeService.queryById(id));
return AjaxResult.success(iTestTreeService.queryById(id));
}
/**
@@ -85,7 +85,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
}
@@ -97,7 +97,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
}
@@ -108,7 +108,7 @@ public class TestTreeController extends BaseController {
@SaCheckPermission("demo:tree:remove")
@Log(title = "测试树表" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@ApiParam("测试树ID串")
public AjaxResult<Void> remove(@ApiParam("测试树ID串")
@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);