src/main/java/com/whyc/controller/RoleController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/UserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/RoleMenuMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/User.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/RoleMenuService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/UserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/RoleController.java
@@ -141,6 +141,14 @@ return roleMenuService.getRoleMenu(roleId); } @PutMapping("updateRoleMenu") @ApiOperation(value = "更新角色菜单") public void updateRoleMenu(@RequestParam int roleId,@RequestBody List<Menu> menus){ roleMenuService.updateRoleMenu(roleId,menus); } @GetMapping("userMenu") src/main/java/com/whyc/controller/UserController.java
@@ -50,7 +50,7 @@ @PostMapping @ApiOperation(value = "添加用户") @RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR) //@RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR) public Response add(@RequestBody User user){ return userService.add(user); } @@ -68,44 +68,44 @@ @GetMapping("/all") @ApiOperation(value = "查询所有用户") @RequiresPermissions(value = {"user:get"}) //@RequiresPermissions(value = {"user:get"}) public List<User> getAll(){ return userService.getAll(); } @GetMapping("/page") @ApiOperation(value = "查询用户分页") @RequiresPermissions(value = {"user:get"}) //@RequiresPermissions(value = {"user:get"}) public IPage<User> getPage(@RequestParam int pageNum,@RequestParam int pageSize){ Page<Object> page = new Page<>(pageNum, pageSize); return userService.getAllWithPage(page); } @PostMapping("/search") @ApiOperation(value = "查询用户分页-根据筛选条件") @RequiresPermissions(value = {"user:get"}) //@RequiresPermissions(value = {"user:get"}) public Response<IPage<User>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody User user){ return userService.getPageByCondition(pageNum,pageSize,user); } @PutMapping @ApiOperation(value = "编辑用户") @RequiresPermissions(value = {"user:update"}) //@RequiresPermissions(value = {"user:update"}) public Response update(@RequestBody User user){ return userService.update(user); } @PutMapping("freezeUser") @ApiOperation(value = "冻结用户") @RequiresPermissions(value = {"user:update"}) public Response updateUserFreeze(@RequestParam int id){ return userService.updateUserFreeze(id); @ApiOperation(value = "启动/冻结用户") //@RequiresPermissions(value = {"user:update"}) public Response updateUserFreeze(@RequestParam int id,@RequestParam int state){ return userService.updateUserFreeze(id,state); } @PutMapping("deleteUser") @ApiOperation(value = "删除用户") @RequiresPermissions(value = {"user:delete"}) //@RequiresPermissions(value = {"user:delete"}) public Response delete(@RequestParam int id){ return userService.deleteUser(id); return userService.delete(id); } /** src/main/java/com/whyc/mapper/RoleMenuMapper.java
@@ -3,7 +3,9 @@ import com.whyc.pojo.Menu; import com.whyc.pojo.RoleMenu; import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.formula.functions.T; import java.util.Collection; import java.util.List; /** src/main/java/com/whyc/pojo/User.java
@@ -57,6 +57,10 @@ private Integer state; @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty("模糊查询信息") @TableField(exist = false) private String search; public User() { } src/main/java/com/whyc/service/RoleMenuService.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** @@ -47,4 +48,20 @@ } return menus; } public void updateRoleMenu(int roleId,List<Menu> menus){ QueryWrapper<RoleMenu> queryWrapper = new QueryWrapper<RoleMenu>().eq("role_id",roleId); mapper.delete(queryWrapper); for (Menu menu:menus) { if(menu.isSelected()){ RoleMenu roleMenu = new RoleMenu(); roleMenu.setMenuId(menu.getId()); roleMenu.setRoleId(roleId); mapper.insert(roleMenu); } } } } src/main/java/com/whyc/service/UserService.java
@@ -81,6 +81,10 @@ public Response<IPage<User>> getPageByCondition(int pageNum,int pageSize,User user){ QueryWrapper<User> queryWrapper = new QueryWrapper<>(user); queryWrapper.or().like(!user.getSearch().isEmpty(),"name",user.getSearch()); queryWrapper.or().like(!user.getSearch().isEmpty(),"real_name",user.getSearch()); queryWrapper.or().like(!user.getSearch().isEmpty(),"phone",user.getSearch()); queryWrapper.or().like(!user.getSearch().isEmpty(),"email",user.getSearch()); IPage<User> page = userMapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper); return new Response<IPage<User>>().set(1,page); } @@ -92,17 +96,21 @@ return new Response().setMsg(0,"更新失败"); } } public Response updateUserFreeze(int id){ public Response updateUserFreeze(int id,int state){ User user =userMapper.selectById(id); user.setState(1); user.setState(state); if(userMapper.updateById(user)>0){ return new Response().setMsg(1,"冻结成功"); if (state==0){ return new Response().setMsg(1,"启用成功"); }else{ return new Response().setMsg(1,"冻结成功"); } }else { return new Response().setMsg(0,"冻结失败"); return new Response().setMsg(0,"更新失败"); } } public Response deleteUser(int id){ /*public Response deleteUser(int id){ User user =userMapper.selectById(id); user.setState(2); if(userMapper.updateById(user)>0){ @@ -110,7 +118,7 @@ }else { return new Response().setMsg(0,"删除失败"); } } }*/ public Response delete(int id) { if(userMapper.deleteById(id)>0){