菜单

src/main/java/com/care/bms/controller/MenuController.java

@@ -47,7 +47,7 @@ public class MenuController {
             return Result.success(list);
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error( "获取列表失败");
+            return Result.error( "获取菜单列表失败");
         }
     }
 

src/main/java/com/care/common/entity/CareMenu.java

@@ -50,9 +50,9 @@ public class CareMenu implements Serializable {
     private Long pid;
 
 
-    @ApiModelProperty("类型：menu.菜单; element.页面元素")
-    @TableField("TYPE")
-    private String type;
+    @ApiModelProperty("层级关系：1：代表父级，2：代表第一层子集，3：代表第二层子集，依次往下")
+    @TableField("LEVEL")
+    private Integer level;
 
 
     @ApiModelProperty("排序号")

src/main/java/com/care/common/enums/UserRoleEnum.java

@@ -11,14 +11,13 @@ public enum UserRoleEnum {
     /**
      *
      */
-    SUPER("super","超级管理员"),
-    ADMIN("admin","机构账号"),
-    STATION("station","服务站账号"),
+    SYSTEM("system","系统管理员"),
+    ORG("org","机构管理员"),
+    STATION("station","服务站管理员"),
     CHANMB("chanmb","管家"),
     SEAT("seat","坐席"),
     OLDER("older","老人"),
-    CONTACT("contact","紧急联系人"),
-    SYSTEM("system","系统");
+    CONTACT("contact","紧急联系人");
     private String value;
     private String name;
     UserRoleEnum(String value, String name) {
@@ -33,10 +32,10 @@ public enum UserRoleEnum {
         if (StrUtil.isEmpty(code)){
             return null;
         }
-        if (SUPER.getValue().equals(code)){
-            return  SUPER.name;
-        } else if (ADMIN.getValue().equals(code)){
-            return ADMIN.name;
+        if (SYSTEM.getValue().equals(code)){
+            return  SYSTEM.name;
+        } else if (ORG.getValue().equals(code)){
+            return ORG.name;
         } else if (STATION.getValue().equals(code)){
             return STATION.name;
         } else if (CHANMB.getValue().equals(code)){
@@ -47,8 +46,6 @@ public enum UserRoleEnum {
             return  OLDER.name;
         }else if (CONTACT.getValue().equals(code)){
             return CONTACT.name;
-        }else if (SYSTEM.getValue().equals(code)){
-            return SYSTEM.name;
         }
 
         return null;

src/main/java/com/care/common/vo/MenuVO.java

@@ -41,8 +41,8 @@ public class MenuVO implements Serializable {
     private Long pid;
 
 
-    @ApiModelProperty("类型：menu.菜单; element.页面元素")
-    private String type;
+    @ApiModelProperty("层级关系：1：代表父级，2：代表第一层子集，3：代表第二层子集，依次往下")
+    private Integer level;
 
 
     @ApiModelProperty("排序号")

src/main/java/com/care/common/vo/sysuser/CareSysUserVO.java

@@ -77,7 +77,7 @@ public class CareSysUserVO implements Serializable {
     private Date modifyTime;
 
 
-    @ApiModelProperty("seat:坐席chanmb:管家 admin管理员")
+    @ApiModelProperty("system:系统管理员,org:机构管理员,station: 服务站管理员,chanmb:管家,seat:坐席")
     private String role;
 
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")

src/main/resources/mybatis/CareMenuMapper.xml

@@ -6,7 +6,7 @@
         <id property="id" column="id" />
         <result property="name" column="name" />
         <result property="url" column="url" />
-        <result property="type" column="type" />
+        <result property="level" column="level" />
         <result property="pid" column="pid" />
         <result property="userId" column="userId" />
         <collection property="children"
@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="findChildMenus" resultMap="menuList">
-        SELECT  m.id,m.name,m.url,m.type,m.pid,u.id userId
+        SELECT  m.id,m.name,m.url,m.level,m.pid,u.id userId
         FROM care_menu m
         left join care_role_menu_rel rm on rm.menu_id=m.id
         left join care_role r on r.id=rm.role_id
@@ -26,7 +26,7 @@
     </select>
 
     <select id="getTopMenus" resultType="com.care.common.vo.MenuVO">
-        SELECT  m.id,m.name,m.url,m.type,m.pid,u.id userId from care_menu m
+        SELECT  m.id,m.name,m.url,m.level,m.pid,u.id userId from care_menu m
         left join  care_role_menu_rel rm on rm.menu_id=m.id
         left join care_role r on r.id=rm.role_id
         left join care_sys_user u on u.role=r.code