From d78c66678bc0f81dc20f4733ec869586b6ef55e4 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Wed, 24 May 2023 10:48:58 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=89=80=E6=9C=89=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E9=83=BD=E6=94=B9=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/param/SysParamController.java | 85 +++++++++---------- .../controller/role/SysRoleController.java | 18 ++-- .../controller/user/UserController.java | 17 ++-- 3 files changed, 53 insertions(+), 67 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java b/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java index c8d8554..0b83e68 100644 --- a/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -3,12 +3,12 @@ package org.nl.system.controller.param; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; +import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; - +import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; import org.springframework.http.HttpStatus; @@ -32,53 +32,50 @@ import java.util.Map; @RequestMapping("/api/param") @RequiredArgsConstructor @SaIgnore -class SysParamController { - private final ISysParamService paramService; +class SysParamController{ + private final ISysParamService paramService; - @PostMapping("/query") - @Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true) - @ApiOperation("查询系统参数") - //@SaCheckPermission("param:list") - public ResponseEntity> query(@RequestBody PageQuery page) { - return new ResponseEntity<>(paramService.queryPage(page), HttpStatus.OK); - } + @PostMapping("/query") + @Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true) + @ApiOperation("查询系统参数") + //@SaCheckPermission("param:list") + public ResponseEntity> query(@RequestBody PageQuery page) { + return new ResponseEntity<>(paramService.queryPage(page), HttpStatus.OK); + } - @PostMapping("/add") - @Log("新增系统参数") - @ApiOperation("新增系统参数") - //@SaCheckPermission("param:add") - public ResponseEntity create(@Validated @RequestBody Param param) { - paramService.create(param); - return new ResponseEntity<>(HttpStatus.CREATED); - } + @PostMapping("/add") + @Log("新增系统参数") + @ApiOperation("新增系统参数") + //@SaCheckPermission("param:add") + public ResponseEntity create(@Validated @RequestBody Param param) { + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> paramService.create(param)), HttpStatus.OK); + } - @PostMapping("/edit") - @Log("修改系统参数") - @ApiOperation("修改系统参数") - //@SaCheckPermission("param:edit") - public ResponseEntity update(@Validated @RequestBody Param param) { - paramService.update(param); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } + @PostMapping("/edit") + @Log("修改系统参数") + @ApiOperation("修改系统参数") + //@SaCheckPermission("param:edit") + public ResponseEntity update(@Validated @RequestBody Param param) { + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> paramService.update(param)), HttpStatus.OK); + } - @Log("删除系统参数") - @ApiOperation("删除系统参数") - //@SaCheckPermission("param:del") - @PostMapping("/delete") - public ResponseEntity delete(@RequestBody String[] ids) { - List Ids = Arrays.asList(ids); - paramService.deleteByIds(Ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/getValueByCode") - @Log("根据编码获取值") - @ApiOperation("根据编码获取值") - @SaIgnore - public ResponseEntity getValueByCode(@RequestBody String code) { - return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); - } + @Log("删除系统参数") + @ApiOperation("删除系统参数") + //@SaCheckPermission("param:del") + @PostMapping("/delete") + public ResponseEntity delete(@RequestBody String[] ids) { + List Ids = Arrays.asList(ids); + paramService.deleteByIds(Ids); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> paramService.deleteByIds(Ids)), HttpStatus.OK); + } + @PostMapping("/getValueByCode") + @Log("根据编码获取值") + @ApiOperation("根据编码获取值") + @SaIgnore + public ResponseEntity getValueByCode(@RequestBody String code) { + return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); + } } diff --git a/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java b/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java index 0669c43..d3ac959 100644 --- a/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -24,6 +24,7 @@ import java.util.Set; /** * 角色表 前端控制器 + * * @author generator * @since 2022-12-15 */ @@ -52,7 +53,7 @@ public class SysRoleController{ @PostMapping("/add") //@SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { - return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.create(param)), HttpStatus.OK); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.create(param)), HttpStatus.OK); } @Log("修改角色") @@ -60,14 +61,7 @@ public class SysRoleController{ @PostMapping("/edit") //@SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { - //roleService.update(param); - JSONObject returnjo = new JSONObject(); - JSONObject result = new JSONObject(); - returnjo.put("result", result); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功"); - return new ResponseEntity<>(returnjo, HttpStatus.OK); - + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.update(param)), HttpStatus.OK); } @Log("删除角色") @@ -75,8 +69,7 @@ public class SysRoleController{ @PostMapping("/delete") //@SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { - roleService.deleteBatchByIds(ids); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.deleteBatchByIds(ids)), HttpStatus.OK); } @ApiOperation("查询菜单树") @@ -91,8 +84,7 @@ public class SysRoleController{ @PostMapping("/menu") //@SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { - roleService.updateMenu(form); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.updateMenu(form)), HttpStatus.OK); } } diff --git a/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java index a11549d..d4cb73a 100644 --- a/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java +++ b/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java @@ -27,6 +27,7 @@ import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; +import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.modules.common.config.RsaProperties; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RsaUtils; @@ -60,7 +61,7 @@ public class UserController{ @ApiOperation("查询用户") @PostMapping("/query") public ResponseEntity> query(@RequestBody PageQuery page) { - UserQuery userQuery =new UserQuery(); + UserQuery userQuery = new UserQuery(); return new ResponseEntity(userService.getUserDetail(userQuery, page), HttpStatus.OK); } @@ -69,8 +70,7 @@ public class UserController{ @PostMapping("/add") // @SaCheckPermission("user:add") public ResponseEntity create(@RequestBody Map user) { - userService.create(user); - return new ResponseEntity<>(HttpStatus.CREATED); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> userService.create(user)), HttpStatus.OK); } @Log("修改用户") @@ -79,8 +79,7 @@ public class UserController{ // @SaCheckPermission("user:edit") public ResponseEntity update(@RequestBody Map resources) throws Exception { - userService.update(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> userService.update(resources)), HttpStatus.OK); } @Log("修改用户：个人中心") @@ -91,7 +90,7 @@ public class UserController{ throw new BadRequestException("不能修改他人资料"); } userService.saveOrUpdate(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> userService.saveOrUpdate(resources)), HttpStatus.OK); } @Log("删除用户") @@ -99,16 +98,14 @@ public class UserController{ @PostMapping("/delete") // @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { - userService.removeByIds(ids); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> userService.removeByIds(ids)), HttpStatus.OK); } @ApiOperation("修改密码") @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { - userService.updatePass(passVo); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> userService.updatePass(passVo)), HttpStatus.OK); } @ApiOperation("修改头像")