合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToUserMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ToUserMapper {
@@ -39,5 +40,8 @@ public interface ToUserMapper {
      * @return
      */
     List<ToUser>  selectRole(@Param("id") Integer id);
-
+	
+	List<Map<String, Object>> getPermission(@Param("userId") Integer userId);
+    
+    List<Map<String, Object>> selectByPermissionList(@Param("array") List<String> parentIdList);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.beust.jcommander.internal.Maps;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.dao.ToSysRoleMapper;
@@ -88,11 +89,40 @@ public class ToUserServerImpl implements IToUserService {
 
         List<ToSysRole> sysRoleList = toSysRoleMapper.selectRoleByUserId(userId);
         toUserVO.setRoles(sysRoleList);
-
+        // 菜单权限
+        toUserVO.setPermissionList(getPermission(userId));
         response.addSuccess(toUserVO);
 
         return response;
     }
+    
+    /**
+     * 获取当前用户的权限列表
+     *
+     * @param userId
+     * @return
+     */
+    public List<Map<String, Object>> getPermission(Integer userId) {
+        List<Map<String,Object>> permissionList = new ArrayList<>();
+        permissionList = toUserMapper.getPermission(userId);
+        //构造id集合
+        List<String> parentIdList = new ArrayList<>();
+        permissionList.forEach(e -> {
+            parentIdList.add(e.get("parent_id").toString());
+        });
+        List<Map<String,Object>> parentPermissionList = toUserMapper.selectByPermissionList(parentIdList);
+        //构造权限
+        List<Map<String,Object>> allList = new ArrayList<>();
+        permissionList.stream().forEach(e -> {
+            allList.add(e);
+            parentPermissionList.stream().forEach(m -> {
+                if (!e.get("id").equals(m.get("id"))){
+                    allList.add(m);
+                }
+            });
+        });
+        return permissionList;
+    }
 
     @Override
     public ResponseBean userList(String parameter) {

CODE/smart-community/operate-api/src/main/java/com/community/huiju/vo/ToUserVO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weiximei
@@ -56,5 +57,10 @@ public class ToUserVO {
 
     /** 角色 **/
     private List<ToSysRole> roles;
+    
+    /**
+     * 权限相关
+     */
+    private List<Map<String,Object>> permissionList;
 
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -256,4 +256,28 @@
       LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
       WHERE tu.id=#{id,jdbcType=INTEGER}
   </select>
+
+  <select id="getPermission" resultType="java.util.Map">
+        SELECT
+            r.id,
+            r.menu_name AS menuName,
+            r.menu_url AS menuUrl,
+            r.parent_id
+        FROM
+            to_sys_user_role t
+            LEFT JOIN to_sys_role_menu m ON t.role_id = m.role_id
+            LEFT JOIN to_sys_menu r ON m.menu_id = r.id
+            AND r.STATUS = 0
+        WHERE
+            t.user_id = #{userId}
+        GROUP BY
+            r.id
+    </select>
+
+  <select id="selectByPermissionList" resultType="java.util.Map">
+    SELECT id,menu_name as menuName,menu_url as menuUrl,parent_id FROM to_sys_menu WHERE id in
+    <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -154,19 +154,6 @@ public class UserController extends BaseController {
 		return responseBean;
 	}
 
-	@ApiOperation(value = "获取用户权限列表", notes = "获取用户权限列表")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
-	})
-	@RequestMapping(value = "/user/permission", method = RequestMethod.GET)
-	public ResponseBean getPermission(HttpSession session){
-		ResponseBean responseBean = new ResponseBean();
-		UserElement userElement = getUserElement(session);
-		responseBean = userService.getPermission(userElement);
-		return responseBean;
-	}
-
 	@ApiOperation(value = "查看所有角色", notes = "查看所有角色")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -53,5 +53,11 @@ public interface UserMapper extends BaseMapper<User> {
      * @return
      */
 	List<Map<String, Object>> getPermission(@Param("userId") Integer userId,@Param("communityId") Integer communityId);
-
+    
+    /**
+     * 获取父权限
+     * @param permissionList
+     * @return
+     */
+    List<Map<String, Object>> selectByPermissionList(@Param("array") List<String> permissionList);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserService.java

@@ -77,15 +77,6 @@ public interface IUserService extends IService<User> {
      */
     ResponseBean upDateStatus(String parameter,Integer userID);
 
-    
-    /**
-     * 获取当前用户的权限列表
-     * @param userElement
-     * @return
-     */
-	ResponseBean getPermission(UserElement userElement);
-
-
     /**
      * 获取所有角色
      * @param parameter

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -10,17 +10,12 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.*;
-import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.UserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.model.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.community.commom.utils.AccountValidatorUtil;
-import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.service.IUserService;
 import com.community.huiju.vo.UserVO;
 import com.google.common.collect.Lists;
@@ -125,6 +120,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询该用户的权限
         // 获取用户权限
         getUserRole(user,userVO);
+        
+        // 菜单权限
+        userVO.setPermissionList(getPermission(userElement));
 
         responseBean.addSuccess(userVO);
 
@@ -364,13 +362,27 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
      * @param userElement
      * @return
      */
-    @Override
-    public ResponseBean getPermission(UserElement userElement) {
-        ResponseBean responseBean = new ResponseBean();
+    public List<Map<String, Object>> getPermission(UserElement userElement) {
         List<Map<String,Object>> permissionList = new ArrayList<>();
         permissionList = userMapper.getPermission(userElement.getId(),userElement.getCommunityId());
-        responseBean.addSuccess(permissionList);
-        return responseBean;
+        //构造id集合
+        List<String> parentIdList = new ArrayList<>();
+        permissionList.forEach(e -> {
+            parentIdList.add(e.get("parent_id").toString());
+        });
+        List<Map<String,Object>> parentPermissionList = userMapper.selectByPermissionList(parentIdList);
+        //构造权限
+        List<Map<String,Object>> allList = new ArrayList<>();
+        permissionList.stream().forEach(e -> {
+            allList.add(e);
+            parentPermissionList.stream().forEach(m -> {
+                if (!e.get("id").equals(m.get("id"))){
+                    allList.add(m);
+                }
+            });
+        });
+        
+        return permissionList;
     }
     
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/UserVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class UserVO extends User {
@@ -38,5 +39,9 @@ public class UserVO extends User {
      * 角色ID
      */
     private String roleId;
-
+    
+    /**
+     * 权限相关
+     */
+    private List<Map<String,Object>> permissionList;
 }

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -111,7 +111,10 @@
 
     <select id="getPermission" resultType="java.util.Map">
         SELECT
-            t.id,r.menu_name,r.menu_url
+            r.id,
+            r.menu_name as menuName,
+            r.menu_url as menuUrl,
+            r.parent_id
         FROM
             tp_sys_user_role t
             LEFT JOIN tp_sys_role_menu m ON t.role_id = m.role_id AND m.community_id = #{communityId}
@@ -119,5 +122,13 @@
         WHERE
             t.user_id = #{userId}
             AND t.community_id = #{communityId}
+        GROUP BY r.id
+    </select>
+
+    <select id="selectByPermissionList" resultType="java.util.Map">
+        SELECT id,menu_name as menuName,menu_url as menuUrl,parent_id FROM tp_sys_menu WHERE id in
+        <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+        #{item}
+        </foreach>
     </select>
 </mapper>

VUECODE/smart-operate-manage/src/permission.js

@@ -1,4 +1,4 @@
-import router from './router'
+import router, { constantRouterMap, currentRouterMap } from './router'
 import store from './store'
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css'// Progress 进度条样式
@@ -16,7 +16,38 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
-          next()
+          const rounterMap = []
+          const permissionMap = res.data.permissionList
+          // 构造父路由
+          constantRouterMap.forEach(router => {
+            permissionMap.forEach(permission => {
+              if (router.name === permission['menuUrl']) {
+                rounterMap.push(router)
+              }
+            })
+          })
+
+          // 构造子路由
+          rounterMap.forEach(router => {
+            const childMap = []
+            router.children.forEach(child => {
+              if (child.hidden) {
+                childMap.push(child)
+              }
+              permissionMap.forEach(permission => {
+                if (child.name === permission['menuUrl']) {
+                  childMap.push(child)
+                }
+              })
+            })
+            router.children = childMap
+          })
+
+          router.addRoutes(rounterMap)
+
+          store.commit('AddRoutes', currentRouterMap.concat(rounterMap))
+
+          next({ ...to, replace: true })
         }).catch((err) => {
           store.dispatch('FedLogOut').then(() => {
             Message.error(err || 'Verification failed, please login again')
@@ -39,7 +70,6 @@ router.beforeEach((to, from, next) => {
       NProgress.done()
     }
   }
-  next()
 })
 
 router.afterEach(() => {

VUECODE/smart-operate-manage/src/router/index.js

@@ -22,38 +22,11 @@ import Layout from '../views/layout/Layout'
   }
 **/
 export const constantRouterMap = [
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
-  { path: '/404', component: () => import('@/views/404'), hidden: true },
-  {
-    path: '/dashboard',
-    component: Layout,
-    redirect: '/dashboard',
-    name: 'Dashboard',
-    hidden: true,
-    children: [{
-      path: 'dashboard',
-      component: () => import('@/views/dashboard/index')
-    }]
-  },
-
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/index',
-    children: [
-      {
-        path: '',
-        component: () => import('@/views/index/index'),
-        name: 'index',
-        meta: { title: '首页', icon: 'index' }
-      }
-    ]
-  },
-
   {
     path: '/community',
     component: Layout,
     redirect: '/conmmunity/download',
+    name: 'community-parent',
     alwaysShow: true,
     meta: { title: '社区数据', icon: 'zip' },
     children: [
@@ -70,6 +43,7 @@ export const constantRouterMap = [
     path: '/banner',
     component: Layout,
     redirect: '/banner/index',
+    name: 'banner',
     alwaysShow: true,
     meta: { title: '运营数据', icon: 'zip' },
     children: [
@@ -106,6 +80,7 @@ export const constantRouterMap = [
     path: '/account',
     component: Layout,
     redirect: '/account/index',
+    name: 'account',
     alwaysShow: true,
     meta: { title: '账号管理', icon: 'zip' },
     children: [
@@ -157,12 +132,31 @@ export const constantRouterMap = [
         meta: { title: '添加成员', icon: 'table' }
       }
     ]
+  }
+]
+
+export const currentRouterMap = [
+  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/404', component: () => import('@/views/404'), hidden: true },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/index',
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/index/index'),
+        name: 'index',
+        meta: { title: '首页', icon: 'index' }
+      }
+    ]
   },
+
   { path: '*', redirect: '/404', hidden: true }
 ]
 
 export default new Router({
   // mode: 'history', //后端支持可开
   scrollBehavior: () => ({ y: 0 }),
-  routes: constantRouterMap
+  routes: currentRouterMap
 })

VUECODE/smart-operate-manage/src/store/modules/app.js

@@ -9,6 +9,9 @@ const app = {
     device: 'desktop'
   },
   mutations: {
+    AddRoutes(state, payload) {
+      state.routes = payload
+    },
     TOGGLE_SIDEBAR: state => {
       if (state.sidebar.opened) {
         Cookies.set('sidebarStatus', 1)

VUECODE/smart-operate-manage/src/views/layout/components/Sidebar/index.vue

@@ -25,7 +25,7 @@ export default {
       'sidebar'
     ]),
     routes() {
-      return this.$router.options.routes
+      return this.$store.state.app.routes
     },
     isCollapse() {
       return !this.sidebar.opened

VUECODE/smart-property-manage/src/permission.js

@@ -1,4 +1,4 @@
-import router from './router'
+import router, { constantRouterMap, currentRouterMap } from './router'
 import store from './store'
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css'// Progress 进度条样式
@@ -16,7 +16,38 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         store.dispatch('GetInfo').then(res => { // 拉取用户信息
-          next()
+          const rounterMap = []
+          const permissionMap = res.data.permissionList
+          // 构造父路由
+          constantRouterMap.forEach(router => {
+            permissionMap.forEach(permission => {
+              if (router.name === permission['menuUrl']) {
+                rounterMap.push(router)
+              }
+            })
+          })
+
+          // 构造子路由
+          rounterMap.forEach(router => {
+            const childMap = []
+            router.children.forEach(child => {
+              if (child.hidden) {
+                childMap.push(child)
+              }
+              permissionMap.forEach(permission => {
+                if (child.name === permission['menuUrl']) {
+                  childMap.push(child)
+                }
+              })
+            })
+            router.children = childMap
+          })
+
+          router.addRoutes(rounterMap)
+
+          store.commit('AddRoutes', currentRouterMap.concat(rounterMap))
+
+          next({ ...to, replace: true })
         }).catch((err) => {
           store.dispatch('FedLogOut').then(() => {
             Message.error(err || 'Verification failed, please login again')
@@ -35,11 +66,12 @@ router.beforeEach((to, from, next) => {
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
+      console.log('tologin')
+
       next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }
-  next()
 })
 
 router.afterEach(() => {

VUECODE/smart-property-manage/src/router/index.js

@@ -22,37 +22,11 @@ import Layout from '../views/layout/Layout'
   }
 **/
 export const constantRouterMap = [
-  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
-  { path: '/404', component: () => import('@/views/404'), hidden: true },
-  {
-    path: '/dashboard',
-    component: Layout,
-    redirect: '/dashboard',
-    name: 'Dashboard',
-    hidden: true,
-    children: [{
-      path: 'dashboard',
-      component: () => import('@/views/dashboard/index')
-    }]
-  },
-
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/index',
-    children: [
-      {
-        path: '',
-        component: () => import('@/views/index/index'),
-        name: 'index',
-        meta: { title: '首页', icon: 'index' }
-      }
-    ]
-  },
   {
     path: '/building',
     component: Layout,
     redirect: '/building/index',
+    name: 'building',
     alwaysShow: true,
     meta: { title: '业主/楼栋', icon: 'zip' },
     children: [
@@ -95,6 +69,7 @@ export const constantRouterMap = [
     path: '/social',
     component: Layout,
     redirect: '/social/index',
+    name: 'social',
     alwaysShow: true,
     meta: { title: '论坛内容', icon: 'zip' },
     children: [
@@ -178,6 +153,7 @@ export const constantRouterMap = [
     path: '/account',
     component: Layout,
     redirect: '/account/index',
+    name: 'account',
     alwaysShow: true,
     meta: { title: '账号管理', icon: 'zip' },
     children: [
@@ -229,6 +205,24 @@ export const constantRouterMap = [
         meta: { title: '编辑成员', icon: 'table' }
       }
     ]
+  }
+]
+
+export const currentRouterMap = [
+  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
+  { path: '/404', component: () => import('@/views/404'), hidden: true },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/index',
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/index/index'),
+        name: 'index',
+        meta: { title: '首页', icon: 'index' }
+      }
+    ]
   },
 
   { path: '*', redirect: '/404', hidden: true }
@@ -237,5 +231,5 @@ export const constantRouterMap = [
 export default new Router({
   // mode: 'history', //后端支持可开
   scrollBehavior: () => ({ y: 0 }),
-  routes: constantRouterMap
+  routes: currentRouterMap
 })

VUECODE/smart-property-manage/src/store/modules/app.js

@@ -6,9 +6,13 @@ const app = {
       opened: !+Cookies.get('sidebarStatus'),
       withoutAnimation: false
     },
-    device: 'desktop'
+    device: 'desktop',
+    routes: [],
   },
   mutations: {
+    AddRoutes(state, payload) {
+      state.routes = payload
+    },
     TOGGLE_SIDEBAR: state => {
       if (state.sidebar.opened) {
         Cookies.set('sidebarStatus', 1)

VUECODE/smart-property-manage/src/views/layout/components/AppMain.vue

@@ -15,17 +15,6 @@ export default {
     // key() {
     //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
     // }
-  },
-  created() {
-    this.$store.dispatch('GetPermission').then((res) => {
-      if (res.code === '0') {
-        alert(1)
-      } else {
-        this.$message.error(res.message)
-      }
-    }).catch(() => {
-        this.$message.error(res.message)
-    })
   }
 }
 </script>

VUECODE/smart-property-manage/src/views/layout/components/Sidebar/index.vue

@@ -25,7 +25,7 @@ export default {
       'sidebar'
     ]),
     routes() {
-      return this.$router.options.routes
+      return this.$store.state.app.routes
     },
     isCollapse() {
       return !this.sidebar.opened