Bladeren bron

添加登录设备

李进 2 jaren geleden
bovenliggende
commit
0c5a37dafd

+ 15 - 1
authorize-api-service/src/main/java/com/xy/entity/SysMenu.java

@@ -43,7 +43,7 @@ public class SysMenu extends BaseEntity2<SysMenu> implements Serializable {
     private String name;
 
     /**
-     * 类型;1=导航列 2=数据页 3=数据接口
+     * 类型;1=目录 2=菜单 3=数据接口/按钮
      */
     private Integer type;
 
@@ -62,4 +62,18 @@ public class SysMenu extends BaseEntity2<SysMenu> implements Serializable {
      */
     private Boolean status;
 
+    /**
+     * 路由
+     */
+    private String route;
+
+    /**
+     * 排序;倒序
+     */
+    private Integer order;
+
+    /**
+     * 图标
+     */
+    private String icon;
 }

+ 9 - 0
authorize-api-service/src/main/java/com/xy/service/impl/SysMenuServiceImpl.java

@@ -60,6 +60,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return R.ok(list);
     }
 
+    @PostMapping("workMenuList")
+    @ApiOperation("用户菜单集合")
+    public R<List<SysMenuDto.Vo>> workMenuList(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
+        List<SysMenuDto.Vo> list = new ArrayList<>();
+        List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenu(workMenu.getSystemId());
+        menus.forEach(sysMenuJoinSysRoleMenu -> list.add(copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu)));
+        return R.ok(list);
+    }
+
     @PostMapping("menu")
     @ApiOperation("全部菜单树")
     public R<List<SysMenuDto.Vo>> menu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {

+ 30 - 3
authorize-api/src/main/java/com/xy/dto/SysMenuDto.java

@@ -42,7 +42,7 @@ public class SysMenuDto {
         @ApiModelProperty(value = "名称", required = true)
         private String name;
 
-        @ApiModelProperty(value = "类型 1=导航列 2=数据页 3=数据接口", required = true)
+        @ApiModelProperty(value = "类型;1=目录 2=菜单 3=数据接口/按钮", required = true)
         private Integer type;
 
         @ApiModelProperty(value = "父菜单id")
@@ -53,6 +53,15 @@ public class SysMenuDto {
 
         @ApiModelProperty("前端参数")
         private String webJson;
+
+        @ApiModelProperty("路由")
+        private String route;
+
+        @ApiModelProperty("排序;倒序")
+        private Integer order;
+
+        @ApiModelProperty("图标")
+        private String icon;
     }
 
     @Data
@@ -67,7 +76,7 @@ public class SysMenuDto {
         @ApiModelProperty(value = "名称")
         private String name;
 
-        @ApiModelProperty(value = "类型 1=导航列 2=数据页 3=数据接口")
+        @ApiModelProperty(value = "类型;1=目录 2=菜单 3=数据接口/按钮")
         private Integer type;
 
         @ApiModelProperty(value = "父菜单id")
@@ -78,6 +87,15 @@ public class SysMenuDto {
 
         @ApiModelProperty("前端参数")
         private String webJson;
+
+        @ApiModelProperty("路由")
+        private String route;
+
+        @ApiModelProperty("排序;倒序")
+        private Integer order;
+
+        @ApiModelProperty("图标")
+        private String icon;
     }
 
     @Data
@@ -108,7 +126,7 @@ public class SysMenuDto {
         @ApiModelProperty("名称")
         private String name;
 
-        @ApiModelProperty("类型;1=导航列 2=数据页 3=数据接口")
+        @ApiModelProperty("类型;1=目录 2=菜单 3=数据接口/按钮")
         private Integer type;
 
         @ApiModelProperty("数据接口uri")
@@ -135,6 +153,15 @@ public class SysMenuDto {
         @ApiModelProperty("更新人")
         private Long updateUser;
 
+        @ApiModelProperty("路由")
+        private String route;
+
+        @ApiModelProperty("排序;倒序")
+        private Integer order;
+
+        @ApiModelProperty("图标")
+        private String icon;
+
         @ApiModelProperty("子级集合")
         private List<Vo> sonSysMenu;
     }

+ 16 - 2
authorize-sdk/src/main/java/com/xy/entity/SysMenuJoinSysRoleMenu.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -55,7 +54,7 @@ public class SysMenuJoinSysRoleMenu implements Serializable {
     private String name;
 
     /**
-     * 类型;1=导航列 2=数据页 3=数据接口
+     * 类型;1=目录 2=菜单 3=数据接口/按钮
      */
     private Integer type;
 
@@ -87,4 +86,19 @@ public class SysMenuJoinSysRoleMenu implements Serializable {
     private Long createUser;
 
     private Long updateUser;
+
+    /**
+     * 路由
+     */
+    private String route;
+
+    /**
+     * 排序
+     */
+    private Integer order;
+
+    /**
+     * 图标
+     */
+    private String icon;
 }