新增用户主键查询

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<List<TbPermission>> getPermissionTree() throws Exception {
+        List<TbPermission> result = service.getPermissionTree();
+        return ResponseReult.success(result);
+    }
+
 }

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;
 
 }

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java

@@ -27,6 +27,8 @@ public interface DyLevelDao {
 
     List<DyLineAndTerminalWithHeartDto> selectListTreeList( @Param("status") Integer status,@Param("list") List<Integer> list);
 
+    List<DyLineAndTerminalWithHeartDto> selectPermissionListTreeList();
+
     List<DyLineAndTerminalNoHeartDto> selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status);
 
     int updateByPrimaryKeySelective(DyLevel record);

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

xymanager_dao/src/main/resources/mappers/DyLevelDao.xml

@@ -248,6 +248,25 @@
         </if>
     </select>
 
+    <select id="selectPermissionListTreeList" resultMap="LineAndTerminalMap">
+        select
+        a.id as id,
+        a.name as name,
+        a.dy_value as dyvalue,
+        b.id as line_id,
+        b.name as line_name,
+        d.id as term_id,
+        d.tower_id as tower_id,
+        c.name as tower_name,
+        c.address as address,
+        d.cmdid as cmdid,
+        d.equip_name as equip_name,
+        d.display_name as display_name
+        from (((dy_level a left join `lines` b on a.id = b.dy_level_id )
+        left join towers c on b.id = c.line_id )
+        left join terminals d on c.id = d.tower_id )
+    </select>
+
     <select id="selectTreeListByChannelId" resultMap="LineAndTerminalNoHeartMap">
         SELECT
         a.id AS id,

xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml

@@ -28,6 +28,13 @@
         sys_users u
     </sql>
 
+    <select id="selectByPrimaryKey"  resultMap="SysUserResult">
+        select
+        *
+        from sys_users
+        where uid = #{uid}
+    </select>
+
     <select id="selectByUserAccount" resultMap="SysUserResult">
         SELECT * FROM sys_users WHERE user_name = #{userName} and status = 1
     </select>

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);
     }
 
-
     /**
      * 获取电压等级列表
      *

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<TbRole> listAll() {
         TbRoleExample example = new TbRoleExample();
@@ -78,4 +85,17 @@ public class RoleServiceImpl implements RoleService {
             }
         }
     }
+
+    /*
+    *
+    * 查询权限树状列表
+    * */
+    @Override
+    public List<TbPermission> getPermissionTree()  {
+        DyLineTreeListModel model = new DyLineTreeListModel();
+        List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectPermissionListTreeList();
+
+        return null;
+
+    }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java

@@ -18,4 +18,7 @@ public interface RoleService {
     List<TbPermission> getPermission(Integer roleId) throws Exception;
 
     void changePermission(Integer roleId, List<TbPermission> list) throws Exception;
+
+    List<TbPermission> getPermissionTree() throws Exception;
+
 }