From c626e5595d3a8ec6951b1207f8d9533c0d39d08b Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 27 Feb 2024 13:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RoleController.java | 7 +++++++ .../entity/SysUserSession.java | 5 +++++ .../shxy/xymanager_dao/dao/DyLevelDao.java | 2 ++ .../xymanager_dao/dao/SysUserMapperDao.java | 3 +++ .../src/main/resources/mappers/DyLevelDao.xml | 19 ++++++++++++++++++ .../resources/mappers/SysUserMapperDao.xml | 7 +++++++ .../impl/DyLevelServiceImpl.java | 1 - .../impl/RoleServiceImpl.java | 20 +++++++++++++++++++ .../service/RoleService.java | 3 +++ 9 files changed, 66 insertions(+), 1 deletion(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java index d8e1f80..0926b49 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java @@ -71,4 +71,11 @@ public class RoleController extends BaseController { return ResponseReult.success("OK"); } + @GetMapping("getPermissionTree") + @ApiOperation("查询权限树状图") + public ResponseReult> getPermissionTree() throws Exception { + List result = service.getPermissionTree(); + return ResponseReult.success(result); + } + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java index f67559f..0e70163 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigInteger; +import java.util.Date; @Data public class SysUserSession implements Serializable { @@ -17,6 +18,10 @@ public class SysUserSession implements Serializable { private BigInteger expireTime; + private Date createTime; + + private Date updateTime; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index b8c5ea9..5ac7f1f 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -27,6 +27,8 @@ public interface DyLevelDao { List selectListTreeList( @Param("status") Integer status,@Param("list") List list); + List selectPermissionListTreeList(); + List selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status); int updateByPrimaryKeySelective(DyLevel record); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java index ec9356c..bbefc64 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java @@ -20,6 +20,9 @@ import java.util.List; @Mapper public interface SysUserMapperDao { + + SysUser selectByPrimaryKey(Integer uid); + /** * @param userAccount * @return com.chenxuan.entity.model.SysUser diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index ce3a224..93e5cd4 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -248,6 +248,25 @@ + + + select + * + from sys_users + where uid = #{uid} + + diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index a66bbe7..3345307 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -254,7 +254,6 @@ public class DyLevelServiceImpl implements DyLevelService { return Asserts.success(model); } - /** * 获取电压等级列表 * diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java index 16a3a16..51344c7 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java @@ -1,9 +1,13 @@ package com.shxy.xymanager_service.impl; +import com.shxy.xymanager_common.dto.DyLineAndTerminalWithHeartDto; import com.shxy.xymanager_common.entity.TbPermission; import com.shxy.xymanager_common.entity.TbPermissionExample; import com.shxy.xymanager_common.entity.TbRole; import com.shxy.xymanager_common.entity.TbRoleExample; +import com.shxy.xymanager_common.enums.CommonStatus; +import com.shxy.xymanager_common.model.DyLineTreeListModel; +import com.shxy.xymanager_dao.dao.DyLevelDao; import com.shxy.xymanager_dao.dao.TbPermissionMapper; import com.shxy.xymanager_dao.dao.TbRoleMapper; import com.shxy.xymanager_service.service.RoleService; @@ -27,6 +31,9 @@ public class RoleServiceImpl implements RoleService { @Resource TbPermissionMapper permissionMapper; + @Resource + DyLevelDao dyLevelDao; + @Override public List listAll() { TbRoleExample example = new TbRoleExample(); @@ -78,4 +85,17 @@ public class RoleServiceImpl implements RoleService { } } } + + /* + * + * 查询权限树状列表 + * */ + @Override + public List getPermissionTree() { + DyLineTreeListModel model = new DyLineTreeListModel(); + List list = dyLevelDao.selectPermissionListTreeList(); + + return null; + + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java index e11581d..5a9d33d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java @@ -18,4 +18,7 @@ public interface RoleService { List getPermission(Integer roleId) throws Exception; void changePermission(Integer roleId, List list) throws Exception; + + List getPermissionTree() throws Exception; + }