From b321755bffaa11617a3dc65dc2c8ba32ea71980e Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Tue, 2 Apr 2024 09:06:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=80=E4=BA=9Bbug=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86CRUD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../ssyx/common/result/ResultCodeEnum.java | 2 +- pom.xml | 48 ++++++------- .../ssyx/acl/controller/AdminController.java | 68 ++++++++++++++++++- .../ssyx/acl/controller/RoleController.java | 9 ++- .../ssyx/acl/service/AdminService.java | 3 + .../acl/service/impl/AdminServiceImpl.java | 18 ++++- .../acl/service/impl/RoleServiceImpl.java | 8 +-- 8 files changed, 123 insertions(+), 35 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 132404b..fd42907 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java b/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java index 1fd6b5b..850005c 100644 --- a/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java +++ b/common/service-util/src/main/java/com/atguigu/ssyx/common/result/ResultCodeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; @Getter public enum ResultCodeEnum { - SUCCESS(200, "成功"), + SUCCESS(200, "操作成功"), FAIL(201, "失败"), SERVICE_ERROR(2012, "服务异常"), DATA_ERROR(204, "数据异常"), diff --git a/pom.xml b/pom.xml index c89e45a..708b841 100644 --- a/pom.xml +++ b/pom.xml @@ -123,28 +123,28 @@ - - - nexus-aliyun - Nexus aliyun - default - https://maven.aliyun.com/repository/public - - false - - - true - - - - spring - https://maven.aliyun.com/repository/spring - - true - - - true - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java index aead02e..a54fe44 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/AdminController.java @@ -1,12 +1,76 @@ package com.atguigu.ssyx.acl.controller; +import com.atguigu.ssyx.acl.service.AdminService; +import com.atguigu.ssyx.acl.service.RoleService; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/admin/acl/user") @Api(tags = "用户管理") public class AdminController { + @Autowired + private AdminService adminService; + @Autowired + private RoleService roleService; + @ApiOperation(value = "获取管理用户分页列表") + @GetMapping("{page}/{limit}") + public Result> index( + @ApiParam(name = "page", value = "当前页码", required = true) + @PathVariable Long page, + + @ApiParam(name = "limit", value = "每页记录数", required = true) + @PathVariable Long limit, + + @ApiParam(name = "userQueryVo", value = "查询对象") + AdminQueryVo userQueryVo + ) { + IPage pageModel = adminService.selectPage(page, limit, userQueryVo); + return Result.success(pageModel); + } + + @ApiOperation(value = "获取管理用户") + @GetMapping("get/{id}") + public Result get(@PathVariable Long id) { + Admin admin = adminService.getById(id); + return Result.success(admin); + } + + @ApiOperation(value = "新增管理用户") + @PostMapping("save") + public Result save(@RequestBody Admin admin) { + boolean isSuccess = adminService.save(admin); + return isSuccess ? Result.success() : Result.error(); + } + + @ApiOperation(value = "修改管理用户") + @PutMapping("update") + public Result updateById(Admin admin) { + adminService.updateById(admin); + return Result.success(); + } + + @ApiOperation(value = "删除管理用户") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + adminService.removeById(id); + return Result.success(); + } + + @ApiOperation(value = "根据id列表删除管理用户") + @DeleteMapping("batchRemove") + public Result> batchRemove(@PathVariable List ids) { + adminService.removeByIds(ids); + return Result.success(); + } } \ No newline at end of file diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java index 1be568f..bd4b0a8 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/controller/RoleController.java @@ -46,10 +46,17 @@ public class RoleController { @ApiOperation(value = "新增角色") @PostMapping("save") public Result saveRole(@RequestBody Role role) { - roleService.updateById(role); + roleService.save(role); return Result.success(); } + @ApiOperation(value = "更新角色") + @PutMapping("update") + public Result updateRole(@RequestBody Role role) { + boolean isSuccess = roleService.updateById(role); + return isSuccess ? Result.success() : Result.error(); + } + @ApiOperation(value = "删除角色") @DeleteMapping("remove/{id}") public Result removeRole(@PathVariable Long id) { diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java index 47cfd0c..98f3c60 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/AdminService.java @@ -1,8 +1,11 @@ package com.atguigu.ssyx.acl.service; import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; public interface AdminService extends IService { + IPage selectPage(Long page, Long limit, AdminQueryVo userQueryVo); } \ No newline at end of file diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java index 074c580..3f03a9e 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/AdminServiceImpl.java @@ -3,15 +3,29 @@ package com.atguigu.ssyx.acl.service.impl; import com.atguigu.ssyx.acl.mapper.AdminMapper; import com.atguigu.ssyx.acl.service.AdminService; import com.atguigu.ssyx.model.acl.Admin; +import com.atguigu.ssyx.vo.acl.AdminQueryVo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; @Service @Slf4j public class AdminServiceImpl extends ServiceImpl implements AdminService { @Override - public boolean save(Admin entity) { - return super.save(entity); + public IPage selectPage(Long page, Long limit, AdminQueryVo vo) { + Page pageParam = new Page(page, limit); + String name = vo.getName(); + String username = vo.getUsername(); + + // 封装条件进行返回 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(!StringUtils.isEmpty(username), Admin::getUsername, username); + wrapper.like(!StringUtils.isEmpty(name), Admin::getName, name); + + return baseMapper.selectPage(pageParam, wrapper); } } \ No newline at end of file diff --git a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java index a7fc7e8..ba0052c 100644 --- a/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java +++ b/service/service-acl/src/main/java/com/atguigu/ssyx/acl/service/impl/RoleServiceImpl.java @@ -17,16 +17,16 @@ import org.springframework.stereotype.Service; public class RoleServiceImpl extends ServiceImpl implements RoleService { @Override public IPage selectPage(Long page, Long limit, RoleQueryVo vo) { - Page rolePage = new Page<>(page, limit); + Page roleParam = new Page<>(page, limit); // 获取条件值 String roleName = vo.getRoleName(); // 创建mp对象 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); // 判断条件值是否为空 - if (StringUtils.isEmpty(roleName)) { - wrapper.like(Role::getRoleName, rolePage); + if (!StringUtils.isEmpty(roleName)) { + wrapper.like(Role::getRoleName, roleParam); } // 调用犯法实现分页查询 - return baseMapper.selectPage(rolePage, wrapper); + return baseMapper.selectPage(roleParam, wrapper); } }