权限 商品 相关

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/GroupTree.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import cn.hutool.core.collection.CollUtil;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.common.vo.TreeNode;
 
+import java.util.List;
+
 /**
  * ${DESCRIPTION}
  *
@@ -28,4 +32,5 @@ public class GroupTree extends TreeNode {
     public void setName(String name) {
         this.name = name;
     }
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/MenuTree.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import cn.hutool.core.collection.CollUtil;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.common.vo.TreeNode;
 
+import java.util.List;
+
 /**
  * Created by Ace on 2017/6/12.
  */
@@ -16,6 +20,15 @@ public class MenuTree extends TreeNode {
     String redirect;
     String code;
     String type;
+    List<Element> elements = CollUtil.newArrayList();
+
+    public List<Element> getElements() {
+        return elements;
+    }
+
+    public void setElements(List<Element> elements) {
+        this.elements = elements;
+    }
 
     public String getCode() {
         return code;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.biz.GroupBiz;
 import com.github.wxiaoqi.security.admin.biz.ResourceAuthorityBiz;
 import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
 import com.github.wxiaoqi.security.admin.vo.GroupTree;
@@ -91,13 +93,6 @@ public class GroupController extends BaseController<GroupBiz, Group> {
         return new ObjectRestResponse().rel(true);
     }
 
-
-    @RequestMapping(value = "/V2/{id}/authority/menu", method = RequestMethod.GET)
-    @ResponseBody
-    public ObjectRestResponse<List<AuthorityMenuTree>> getMenuAuthorityV2(@PathVariable  int id){
-        return new ObjectRestResponse().data(baseBiz.getAuthorityMenuV2(id)).rel(true);
-    }
-
     @RequestMapping(value = "/{id}/authority/menu", method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<List<AuthorityMenuTree>> getMenuAuthority(@PathVariable  int id){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MenuController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
@@ -32,6 +34,9 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
     @Autowired
     private UserBiz userBiz;
 
+    @Autowired
+    private ElementBiz elementBiz;
+
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public List<Menu> list(String title) {
@@ -122,6 +127,9 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
             node = new MenuTree();
             BeanUtils.copyProperties(menu, node);
             node.setLabel(menu.getTitle());
+            node.setElements(elementBiz.selectList(new Element(){{
+                setMenuId(menu.getId().toString());
+            }}));
             trees.add(node);
         }
         return TreeUtil.bulid(trees,root) ;