角色权限相关

doc/002.20200426第二版/qc_init.sql

@@ -5,9 +5,10 @@ ALTER TABLE `med_behospital_info` MODIFY COLUMN `doctor_id` varchar(16) DEFAULT
 ALTER TABLE `sys_menu` ADD  COLUMN `show_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否在右侧菜单显示(0:不显示，1：显示)' AFTER `code`;
 ALTER TABLE `sys_menu` ADD  COLUMN `maintain_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否可以维护(0:不可维护，1：可以维护)' AFTER `show_status`;
 
-
 ALTER TABLE `sys_permission` ADD  COLUMN `code` varchar(10) NOT NULL DEFAULT '' COMMENT '资源编码' AFTER `name`;
 
+ALTER TABLE `sys_user` ADD  COLUMN `status` int(11) NOT NULL DEFAULT '1' COMMENT '是否启用(0:停用，1：启用)' AFTER `linkman`;
+
 DROP TABLE IF EXISTS `sys_user_dept`;
 CREATE TABLE `sys_user_dept` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',

src/main/java/com/diagbot/dto/SysRoleDTO.java

@@ -18,30 +18,30 @@ public class SysRoleDTO {
      */
     private Long id;
 
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
+//    /**
+//     * 是否删除,N:未删除，Y:删除
+//     */
+//    private String isDeleted;
+//
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//    /**
+//     * 记录修改时间,如果时间是1970年则表示纪录未修改
+//     */
+//    private Date gmtModified;
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 修改人,如果为0则表示纪录未修改
+//     */
+//    private String modifier;
 
     /**
      * 角色名称

src/main/java/com/diagbot/enums/StatusEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum StatusEnum implements KeyedNamed {
+    Disable(0, "禁用"),
+    Enable(1, "启用");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    StatusEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static StatusEnum getEnum(int key) {
+        for (StatusEnum item : StatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        StatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

src/main/java/com/diagbot/facade/SysRoleFacade.java

@@ -47,7 +47,7 @@ public class SysRoleFacade extends SysRoleServiceImpl {
     @Qualifier("sysRolePermissionServiceImpl")
     private SysRolePermissionServiceImpl sysRolePermissionService;
 
-    public List<SysRoleDTO> page(SysRoleQueryVO sysRoleQueryVO) {
+    public List<SysRoleDTO> list(SysRoleQueryVO sysRoleQueryVO) {
         List<SysRole> sysRoleList = this.list(new QueryWrapper<SysRole>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .gt("id", -1L)
@@ -56,6 +56,10 @@ public class SysRoleFacade extends SysRoleServiceImpl {
         return sysRoleDTOList;
     }
 
+    public List<SysRoleDTO> listForUser(SysRoleQueryVO sysRoleQueryVO) {
+        return this.list(sysRoleQueryVO);
+    }
+
     public List<SysRoleMenuDTO> getRoleMenu(SysRoleMenuQueryVO sysRoleMenuQueryVO) {
         List<SysMenuPermissionDTO> sysMenuPermissionDTOList = this.getMenuPermission(sysRoleMenuQueryVO);
         List<SysRoleMenuDTO> sysRoleMenuDTOList = new ArrayList<>();

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.entity.SysUser;
 import com.diagbot.entity.wrapper.SysMenuWrapper;
 import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
@@ -73,6 +74,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         }
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("username", username)
+                .eq("status", StatusEnum.Enable.getKey())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
         SysUser user = this.getOne(userQueryWrapper, false);
         if (null == user) {
@@ -177,6 +179,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         String userId = SysUserUtils.getCurrentPrincipleID();
         SysUser user = this.getOne(new QueryWrapper<SysUser>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey())
                 .eq("id", userId), false);
         if (null == user) {
             throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
@@ -205,7 +208,10 @@ public class SysUserFacade extends SysUserServiceImpl {
         LoginDTO data = new LoginDTO();
 
         Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
-        SysUser user = this.getById(userId);
+        SysUser user = this.getOne(new QueryWrapper<SysUser>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("id", userId), false);
         if (user == null) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "用户不存在【" + userId + "】");
@@ -253,7 +259,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         List<SysMenuWrapper> res = new ArrayList<>();
         List<SysMenuWrapper> list = menuMap.get(menu.getId());
         List<SysUserPermissionDTO> listPermission = menuPermissionMap.get(menu.getId());
-        if (ListUtil.isNotEmpty(listPermission)){
+        if (ListUtil.isNotEmpty(listPermission)) {
             menu.setSysUserPermissionDTOList(listPermission);
         }
         if (ListUtil.isNotEmpty(list)) {

src/main/java/com/diagbot/web/SysRoleController.java

@@ -36,12 +36,20 @@ public class SysRoleController {
     @Autowired
     private SysRoleFacade sysRoleFacade;
 
-    @ApiOperation(value = "获取角色列表分页信息[by:gaodm]",
+    @ApiOperation(value = "获取角色列表信息[by:gaodm]",
             notes = "")
-    @PostMapping("/page")
-    @SysLogger("page")
-    public RespDTO<List<SysRoleDTO>> page(@RequestBody SysRoleQueryVO sysRoleQueryVO) {
-        return RespDTO.onSuc(sysRoleFacade.page(sysRoleQueryVO));
+    @PostMapping("/list")
+    @SysLogger("list")
+    public RespDTO<List<SysRoleDTO>> list(@RequestBody SysRoleQueryVO sysRoleQueryVO) {
+        return RespDTO.onSuc(sysRoleFacade.list(sysRoleQueryVO));
+    }
+
+    @ApiOperation(value = "获取角色列表信息[by:gaodm]",
+            notes = "")
+    @PostMapping("/listForUser")
+    @SysLogger("listForUser")
+    public RespDTO<List<SysRoleDTO>> listForUser(@RequestBody SysRoleQueryVO sysRoleQueryVO) {
+        return RespDTO.onSuc(sysRoleFacade.listForUser(sysRoleQueryVO));
     }
 
     @ApiOperation(value = "获取角色菜权限单等数据[by:gaodm]",

src/main/java/com/diagbot/web/SysUserController.java

@@ -96,7 +96,6 @@ public class SysUserController {
         return RespDTO.onSuc(data);
     }
 
-    //TODO gaodm
     //-------------用户维护BEGAIN------------------------
 
     //-------------用户维护END---------------------------

src/main/resources/mapper/SysPermissionMapper.xml

@@ -20,7 +20,7 @@
     <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.SysPermission">
       select DISTINCT p.permissionUrl, p.method from sys_user u, sys_user_role sru, sys_role_permission rp, sys_permission p
       where u.is_deleted = 'N' and sru.is_deleted = 'N' and rp.is_deleted = 'N' and p.is_deleted = 'N'
-      and u.id = sru.user_id and sru.role_id = rp.role_id and rp.permission_id = p.id
+      and u.id = sru.user_id and sru.role_id = rp.role_id and rp.permission_id = p.id and u.status = 1
       and u.id= #{userId}
      </select>
 </mapper>

src/main/resources/mapper/SysUserUaaMapper.xml

@@ -31,7 +31,7 @@
     <select id="getByUserName" parameterType="java.lang.String" resultMap="userUaaMap">
 		select u.*
 		from sys_user u
-        where is_deleted = 'N' and u.username= #{username}
+        where is_deleted = 'N' and u.status = 1 and u.username= #{username}
 	</select>
 
     <select id="getHospByUserName" parameterType="java.lang.String" resultMap="userUaaHospMap">
@@ -43,6 +43,7 @@
             bas_hospital_info h
         WHERE
             u.is_deleted = 'N'
+        AND u.status = 1
         AND u.username = #{username}
         AND u.id = uh.user_id
         AND uh.is_deleted = 'N'