diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java deleted file mode 100644 index 31abdc3a..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cloud.kicc.system.api.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * 角色和部门关联表 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("sys_role_dept") -public class RoleDept implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 部门ID - */ - private String deptId; - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java index 98235eec..6a3b1540 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java @@ -1,28 +1,26 @@ package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.system.api.entity.Dept; -import com.cloud.kicc.system.api.entity.RoleDept; import com.cloud.kicc.system.api.entity.User; -import com.cloud.kicc.system.api.vo.ResultVo; import com.cloud.kicc.system.service.DeptService; -import com.cloud.kicc.system.service.RoleDeptService; import com.cloud.kicc.system.service.UserService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.common.log.annotation.SysLog; import lombok.AllArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.stream.Collectors; /** *

- * 机构信息 + * 部门信息 *

* * @Author: entfrm开发团队-王翔 @@ -35,13 +33,11 @@ public class DeptController { private final DeptService deptService; private final UserService userService; - private final RoleDeptService roleDeptService; - private final RedisTemplate redisTemplate; - private QueryWrapper getQueryWrapper(Dept dept) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(dept.getName()), "name", dept.getName()) - .eq(StrUtil.isNotBlank(dept.getCode()), "code", dept.getCode()); + private LambdaQueryWrapper getQueryWrapper(Dept dept) { + return Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(dept.getName()), Dept::getName, dept.getName()) + .eq(StrUtil.isNotBlank(dept.getStatus()), Dept::getStatus, dept.getStatus()); } @GetMapping("/list") @@ -69,7 +65,7 @@ public class DeptController { @PreAuthorize("@pms.hasPermission('dept_edit')") public R update(@RequestBody Dept dept) { deptService.updateById(dept); - //更新用户机构名称 + // 更新用户机构名称 new Thread(() -> { List userList = userService.list(new QueryWrapper().eq("dept_id", dept.getDeptId())); for (User user : userList) { @@ -84,15 +80,13 @@ public class DeptController { @DeleteMapping("/remove/{id:\\w+}") @PreAuthorize("@pms.hasPermission('dept_del')") public R remove(@PathVariable("id") String id) { - if (deptService.getOne(new QueryWrapper().eq("parent_id", id)) != null) { + if (deptService.getOne(Wrappers.lambdaQuery().eq(Dept::getParentId, id)) != null) { return R.error("存在下级机构,不允许删除"); } - if (userService.getOne(new QueryWrapper().eq("dept_id", id)) != null) { + if (userService.getOne(Wrappers.lambdaQuery().eq(User::getDeptId, id)) != null) { return R.error("机构存在用户,不允许删除"); } deptService.removeById(id); - redisTemplate.delete("deptList"); - redisTemplate.delete("regionList"); return R.ok(); } @@ -104,24 +98,11 @@ public class DeptController { return R.ok(); } - /** - * 加载机构列表树 - */ + /** 加载机构列表树 */ @GetMapping("/deptTree") public R deptTree() { List deptList = deptService.list(new QueryWrapper().orderByAsc("sort")); return R.ok(deptService.buildTree(deptList, "0")); } - /** - * 加载角色机构（数据权限）列表树 - */ - @GetMapping("/roleDeptTree/{roleId:\\w+}") - public R roleDeptTree(@PathVariable String roleId) { - List deptList = deptService.list(new QueryWrapper().orderByAsc("sort")); - List depts = roleDeptService.list(new QueryWrapper().eq("role_id", roleId)) - .stream().map(roleMenu -> roleMenu.getDeptId()).collect(Collectors.toList()); - return R.ok(new ResultVo().setResult(deptService.buildTree(deptList, "0")).setExtend(depts)); - } - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java index e6d51bf7..a1dedb6f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java @@ -17,7 +17,6 @@ public interface DeptService extends IService { /** * 构建树 - * * @param list 分类表 * @param parentId 传入的父节点ID * @return String diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java deleted file mode 100644 index 556e0c14..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cloud.kicc.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.RoleDept; - -/** - *

- * 角色和部门关联表 服务类 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -public interface RoleDeptService extends IService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java index bee73c2a..55f9a600 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java @@ -22,13 +22,6 @@ import java.util.List; @Service public class DeptServiceImpl extends ServiceImpl implements DeptService { - /** - * 构建树 - * - * @param list 分类表 - * @param parentId 传入的父节点ID - * @return String - */ @Override public List buildTree(List list, String parentId){ List deptList = new ArrayList(); @@ -42,16 +35,11 @@ public class DeptServiceImpl extends ServiceImpl implements De return deptList; } - /** - * 递归列表 - * - * @param list - * @param t - */ - private void recursion(List list, Dept t) { + /** 递归列表 */ + private void recursion(List list, Dept dept) { // 得到子节点列表 - List childList = getChildList(list, t); - t.setChildren(childList); + List childList = getChildList(list, dept); + dept.setChildren(childList); for (Dept tChild : childList) { if (hasChild(list, tChild)) { // 判断是否有子节点 @@ -64,28 +52,22 @@ public class DeptServiceImpl extends ServiceImpl implements De } } - /** - * 得到子节点列表 - */ - private List getChildList(List list, Dept t) { - List tlist = new ArrayList(); + /** 得到子节点列表 */ + private List getChildList(List list, Dept dept) { + List deptList = new ArrayList(); Iterator it = list.iterator(); while (it.hasNext()) { Dept n = it.next(); - if (StrUtil.equals(n.getParentId(), t.getDeptId())) { - tlist.add(n); + if (StrUtil.equals(n.getParentId(), dept.getDeptId())) { + deptList.add(n); } } - return tlist; + return deptList; } - /** - * 判断是否有子节点 - */ + /** 判断是否有子节点 */ private boolean hasChild(List list, Dept t) { return getChildList(list, t).size() > 0 ? true : false; } - - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java deleted file mode 100644 index cc9b9250..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloud.kicc.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.RoleDept; -import com.cloud.kicc.system.mapper.RoleDeptMapper; -import com.cloud.kicc.system.service.RoleDeptService; -import org.springframework.stereotype.Service; - -/** - *

- * 角色和部门关联表 服务实现类 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Service -public class RoleDeptServiceImpl extends ServiceImpl implements RoleDeptService { - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java index 5ddd9621..f4d453cf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java @@ -1,16 +1,10 @@ package com.cloud.kicc.system.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.system.api.entity.Dept; import com.cloud.kicc.system.api.entity.Role; -import com.cloud.kicc.system.api.entity.RoleDept; import com.cloud.kicc.system.api.entity.RoleMenu; import com.cloud.kicc.system.mapper.RoleMapper; -import com.cloud.kicc.system.service.DeptService; -import com.cloud.kicc.system.service.RoleDeptService; import com.cloud.kicc.system.service.RoleMenuService; import com.cloud.kicc.system.service.RoleService; import lombok.AllArgsConstructor; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleDeptMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleDeptMapper.xml deleted file mode 100644 index 60859548..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RoleDeptMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -