diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RoleDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RoleDTO.java deleted file mode 100644 index 5361591a7..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RoleDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.api.dto; - -import com.pig4cloud.pigx.admin.api.entity.SysRole; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author lengleng - * @date 2018/1/20 - * 角色Dto - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class RoleDTO extends SysRole { - /** - * 角色部门Id - */ - private Integer roleDeptId; - - /** - * 部门名称 - */ - private String deptName; -} diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java deleted file mode 100644 index 64fd192db..000000000 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleDept.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.api.entity; - -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; - -/** - *

- * 角色与部门对应关系 - *

- * - * @author lengleng - * @since 2018-01-20 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_role_dept") -public class SysRoleDept extends Model { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - /** - * 角色ID - */ - private Integer roleId; - /** - * 部门ID - */ - private Integer deptId; - - - @Override - protected Serializable pkVal() { - return this.id; - } - -} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index b5bc36efe..4faacde85 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -42,8 +42,8 @@ import java.util.List; * @since 2018-01-20 */ @RestController -@RequestMapping("/dept") @AllArgsConstructor +@RequestMapping("/dept") public class DeptController { private final SysDeptService sysDeptService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index 2bdeed422..2bcac24f0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -28,7 +28,7 @@ import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.security.access.prepost.PreAuthorize; @@ -47,10 +47,10 @@ import java.util.Map; * @since 2017-11-19 */ @RestController +@AllArgsConstructor @RequestMapping("/dict" ) public class DictController { - @Autowired - private SysDictService sysDictService; + private final SysDictService sysDictService; /** * 通过ID查询字典信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index 78bd6f271..e40e9a4da 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -28,7 +28,7 @@ import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -44,10 +44,10 @@ import java.util.stream.Collectors; * @date 2017/10/31 */ @RestController +@AllArgsConstructor @RequestMapping("/menu") public class MenuController { - @Autowired - private SysMenuService sysMenuService; + private final SysMenuService sysMenuService; /** * 返回当前用户的树形菜单集合 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index 98798244d..9e7ebf019 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -25,7 +25,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -41,10 +41,10 @@ import java.util.Map; * @since 2018-05-15 */ @RestController +@AllArgsConstructor @RequestMapping("/client") public class OauthClientDetailsController { - @Autowired - private SysOauthClientDetailsService sysOauthClientDetailsService; + private final SysOauthClientDetailsService sysOauthClientDetailsService; /** * 通过ID查询 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index 28f5e584d..bab11dbfd 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -21,14 +21,13 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; import com.pig4cloud.pigx.admin.service.SysRoleService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -40,12 +39,11 @@ import java.util.Map; * @date 2017/11/5 */ @RestController +@AllArgsConstructor @RequestMapping("/role") public class RoleController { - @Autowired - private SysRoleService sysRoleService; - @Autowired - private SysRoleMenuService sysRoleMenuService; + private final SysRoleService sysRoleService; + private final SysRoleMenuService sysRoleMenuService; /** * 通过ID查询角色信息 @@ -61,25 +59,25 @@ public class RoleController { /** * 添加角色 * - * @param roleDto 角色信息 + * @param sysRole 角色信息 * @return success、false */ @PostMapping @PreAuthorize("@pms.hasPermission('sys_role_add')") - public R role(@RequestBody RoleDTO roleDto) { - return new R<>(sysRoleService.insertRole(roleDto)); + public R role(@RequestBody SysRole sysRole) { + return new R<>(sysRoleService.insert(sysRole)); } /** * 修改角色 * - * @param roleDto 角色信息 + * @param sysRole 角色信息 * @return success/false */ @PutMapping @PreAuthorize("@pms.hasPermission('sys_role_edit')") - public R roleUpdate(@RequestBody RoleDTO roleDto) { - return new R<>(sysRoleService.updateRoleById(roleDto)); + public R roleUpdate(@RequestBody SysRole sysRole) { + return new R<>(sysRoleService.updateById(sysRole)); } @DeleteMapping("/{id}") @@ -93,12 +91,11 @@ public class RoleController { /** * 获取角色列表 * - * @param deptId 部门ID * @return 角色列表 */ - @GetMapping("/roleList/{deptId}") - public List roleList(@PathVariable Integer deptId) { - return sysRoleService.selectListByDeptId(deptId); + @GetMapping("/roleList") + public List roleList() { + return sysRoleService.selectList(new EntityWrapper<>()); } @@ -110,7 +107,7 @@ public class RoleController { */ @GetMapping("/rolePage") public Page rolePage(@RequestParam Map params) { - return sysRoleService.selectwithDeptPage(new Query<>(params), new EntityWrapper<>()); + return sysRoleService.selectPage(new Query<>(params), new EntityWrapper<>()); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 5c1faaf0a..f49c5fbc0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -20,6 +20,7 @@ package com.pig4cloud.pigx.admin.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.dto.UserInfo; @@ -92,6 +93,19 @@ public class UserController { return userService.selectUserVoById(id); } + /** + * 根据用户名查询用户信息 + * + * @param username 用户名 + * @return + */ + @GetMapping("/details/{username}") + public R user(@PathVariable String username) { + SysUser condition = new SysUser(); + condition.setUsername(username); + return new R<>(userService.selectOne(new EntityWrapper<>(condition))); + } + /** * 删除用户信息 * @@ -110,7 +124,6 @@ public class UserController { /** * 添加用户 - * TODO 什么鬼逻辑，先删除再增加？？？ * * @param userDto 用户信息 * @return success/false @@ -119,10 +132,6 @@ public class UserController { @PostMapping @PreAuthorize("@pms.hasPermission('sys_user_add')") public R user(@RequestBody UserDTO userDto) { - SysUser deletedUser = userService.selectDeletedUserByUsername(userDto.getUsername()); - if (deletedUser != null) { - userService.deleteSysUserByUsernameAndUserId(userDto.getUsername(), deletedUser.getUserId()); - } SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); sysUser.setDelFlag(CommonConstant.STATUS_NORMAL); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleDeptMapper.java deleted file mode 100644 index 3ed3d6892..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleDeptMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.mapper; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.pig4cloud.pigx.admin.api.entity.SysRoleDept; - -/** - *

- * 角色与部门对应关系 Mapper 接口 - *

- * - * @author lengleng - * @since 2018-01-20 - */ -public interface SysRoleDeptMapper extends BaseMapper { - -} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index 1bf28f160..ab9603351 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -21,10 +21,8 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysRole; -import com.pig4cloud.pigx.common.core.util.Query; import java.util.List; -import java.util.Map; /** *

@@ -35,24 +33,6 @@ import java.util.Map; * @since 2017-10-29 */ public interface SysRoleMapper extends BaseMapper { - - /** - * 查询角色列表含有部门信息 - * - * @param query 查询对象 - * @param condition 条件 - * @return List - */ - List selectRolePage(Query query, Map condition); - - /** - * 通过部门ID查询角色列表 - * - * @param deptId 部门ID - * @return 角色列表 - */ - List selectListByDeptId(Integer deptId); - /** * 通过用户ID，查询角色信息 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 08cd8b9b3..e6749432c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -62,22 +62,4 @@ public interface SysUserMapper extends BaseMapper { * @return userVo */ UserVO selectUserVoById(Integer id); - - /** - * 通过用户名查找已经删除的用户 - * - * @param username 用户名 - * @return 用户对象 - */ - SysUser selectDeletedUserByUsername(@Param("username") String username); - - /** - * 根据用户名删除用户（真实删除） - * - * @param username username - * @param userId userId - * @return - */ - Boolean deleteSysUserByUsernameAndUserId(@Param("username") String username, @Param("userId") Integer userId); - } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleDeptService.java deleted file mode 100644 index 9c0a1eb62..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleDeptService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.service; - -import com.baomidou.mybatisplus.service.IService; -import com.pig4cloud.pigx.admin.api.entity.SysRoleDept; - -/** - *

- * 角色与部门对应关系 服务类 - *

- * - * @author lengleng - * @since 2018-01-20 - */ -public interface SysRoleDeptService extends IService { - -} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java index 11435c5b2..694ff28b3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java @@ -19,12 +19,8 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; -import com.pig4cloud.pigx.common.core.util.Query; import java.util.List; @@ -38,39 +34,6 @@ import java.util.List; */ public interface SysRoleService extends IService { - /** - * 添加角色 - * - * @param roleDto 角色信息 - * @return 成功、失败 - */ - Boolean insertRole(RoleDTO roleDto); - - /** - * 分页查角色列表 - * - * @param objectQuery 查询条件 - * @param objectEntityWrapper wapper - * @return page - */ - Page selectwithDeptPage(Query objectQuery, EntityWrapper objectEntityWrapper); - - /** - * 更新角色 - * - * @param roleDto 含有部门信息 - * @return 成功、失败 - */ - Boolean updateRoleById(RoleDTO roleDto); - - /** - * 通过部门ID查询角色列表 - * - * @param deptId 部门ID - * @return 角色列表 - */ - List selectListByDeptId(Integer deptId); - /** * 通过用户ID，查询角色信息 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 53c2260e2..1f0b84eff 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -87,23 +87,6 @@ public interface SysUserService extends IService { */ UserVO selectUserVoById(Integer id); - /** - * 通过用户名查找已经删除的用户 - * - * @param username 用户名 - * @return - */ - SysUser selectDeletedUserByUsername(String username); - - /** - * 根据用户名删除用户（真实删除） - * - * @param username username - * @param userId userId - * @return - */ - Boolean deleteSysUserByUsernameAndUserId(String username, Integer userId); - /** * 查询上级部门的用户信息 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index a5af90699..f0db45e29 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -26,7 +26,6 @@ import com.pig4cloud.pigx.admin.api.vo.MenuVO; import com.pig4cloud.pigx.admin.mapper.SysMenuMapper; import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -43,13 +42,11 @@ import java.util.List; */ @Service public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { - @Autowired - private SysMenuMapper sysMenuMapper; @Override @Cacheable(value = "menu_details", key = "#roleId + '_menu'") public List findMenuByRoleId(Integer roleId) { - return sysMenuMapper.findMenuByRoleId(roleId); + return baseMapper.findMenuByRoleId(roleId); } @Override diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleDeptServiceImpl.java deleted file mode 100644 index 82620024e..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleDeptServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pigx.admin.service.impl; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.entity.SysRoleDept; -import com.pig4cloud.pigx.admin.mapper.SysRoleDeptMapper; -import com.pig4cloud.pigx.admin.service.SysRoleDeptService; -import org.springframework.stereotype.Service; - -/** - *

- * 角色与部门对应关系 服务实现类 - *

- * - * @author lengleng - * @since 2018-01-20 - */ -@Service -public class SysRoleDeptServiceImpl extends ServiceImpl implements SysRoleDeptService { - -} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index 021ec222e..fa4440b8a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor public class SysRoleMenuServiceImpl extends ServiceImpl implements SysRoleMenuService { - private CacheManager cacheManager; + private final CacheManager cacheManager; /** * @param role diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index 2c6d69a66..1802b821e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -19,20 +19,11 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; -import com.pig4cloud.pigx.admin.api.entity.SysRoleDept; -import com.pig4cloud.pigx.admin.mapper.SysRoleDeptMapper; import com.pig4cloud.pigx.admin.mapper.SysRoleMapper; import com.pig4cloud.pigx.admin.service.SysRoleService; -import com.pig4cloud.pigx.common.core.util.Query; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -46,79 +37,6 @@ import java.util.List; */ @Service public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { - @Autowired - private SysRoleDeptMapper sysRoleDeptMapper; - @Autowired - private SysRoleMapper sysRoleMapper; - - /** - * 添加角色 - * - * @param roleDto 角色信息 - * @return 成功、失败 - */ - @Override - public Boolean insertRole(RoleDTO roleDto) { - SysRole sysRole = new SysRole(); - BeanUtils.copyProperties(roleDto, sysRole); - sysRoleMapper.insert(sysRole); - SysRoleDept roleDept = new SysRoleDept(); - roleDept.setRoleId(sysRole.getRoleId()); - roleDept.setDeptId(roleDto.getRoleDeptId()); - sysRoleDeptMapper.insert(roleDept); - return true; - } - - /** - * 分页查角色列表 - * - * @param query 查询条件 - * @param wrapper wapper - * @return page - */ - @Override - public Page selectwithDeptPage(Query query, EntityWrapper wrapper) { - query.setRecords(sysRoleMapper.selectRolePage(query, query.getCondition())); - return query; - } - - /** - * 更新角色 - * - * @param roleDto 含有部门信息 - * @return 成功、失败 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public Boolean updateRoleById(RoleDTO roleDto) { - //删除原有的角色部门关系 - SysRoleDept condition = new SysRoleDept(); - condition.setRoleId(roleDto.getRoleId()); - sysRoleDeptMapper.delete(new EntityWrapper<>(condition)); - - //更新角色信息 - SysRole sysRole = new SysRole(); - BeanUtils.copyProperties(roleDto, sysRole); - sysRoleMapper.updateById(sysRole); - - //维护角色部门关系 - SysRoleDept roleDept = new SysRoleDept(); - roleDept.setRoleId(sysRole.getRoleId()); - roleDept.setDeptId(roleDto.getRoleDeptId()); - sysRoleDeptMapper.insert(roleDept); - return true; - } - - /** - * 通过部门ID查询角色列表 - * - * @param deptId 部门ID - * @return 角色列表 - */ - @Override - public List selectListByDeptId(Integer deptId) { - return sysRoleMapper.selectListByDeptId(deptId); - } /** * 通过用户ID，查询角色信息 @@ -128,6 +46,6 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override public List findRolesByUserId(Integer userId) { - return sysRoleMapper.findRolesByUserId(userId); + return baseMapper.findRolesByUserId(userId); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 453782f8f..30b3221df 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -62,7 +62,6 @@ import java.util.stream.Collectors; public class SysUserServiceImpl extends ServiceImpl implements SysUserService { private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder(); private final SysMenuService sysMenuService; - private final SysUserMapper sysUserMapper; private final SysRoleService sysRoleService; private final SysDeptService sysDeptService; private final SysUserRoleService sysUserRoleService; @@ -120,7 +119,7 @@ public class SysUserServiceImpl extends ServiceImpl impl dataScope.setIsOnly(true); dataScope.setDeptIds(getChildDepts()); Object username = query.getCondition().get("username"); - query.setRecords(sysUserMapper.selectUserVoPage(query, username, dataScope)); + query.setRecords(baseMapper.selectUserVoPage(query, username, dataScope)); return query; } @@ -133,33 +132,7 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public UserVO selectUserVoById(Integer id) { - return sysUserMapper.selectUserVoById(id); - } - - /** - * 通过用户名查找已经删除的用户 - * - * @param username 用户名 - * @return 用户对象 - */ - @Override - public SysUser selectDeletedUserByUsername(String username) { - return sysUserMapper.selectDeletedUserByUsername(username); - } - - /** - * 根据用户名删除用户（真实删除） - * - * @param username - * @return - */ - @Override - public Boolean deleteSysUserByUsernameAndUserId(String username, Integer userId) { - sysUserMapper.deleteSysUserByUsernameAndUserId(username, userId); - SysUserRole condition = new SysUserRole(); - condition.setUserId(userId); - sysUserRoleService.delete(new EntityWrapper<>(condition)); - return Boolean.TRUE; + return baseMapper.selectUserVoById(id); } /** @@ -179,7 +152,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = "user_details", key = "#username") public R updateUserInfo(UserDTO userDto, String username) { - UserVO userVO = sysUserMapper.selectUserVoByUsername(username); + UserVO userVO = baseMapper.selectUserVoByUsername(username); SysUser sysUser = new SysUser(); if (StrUtil.isNotBlank(userDto.getPassword()) && StrUtil.isNotBlank(userDto.getNewpassword1())) { diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleDeptMapper.xml deleted file mode 100644 index a93f88536..000000000 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleDeptMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - id, role_id AS roleId, dept_id AS deptId - - - diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml index 7c61430b7..7694b2b81 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -32,41 +32,6 @@ - - - - - - - - - - - - - - - - - - - - DELETE FROM sys_user WHERE username=#{username} AND user_id=#{userId}; -