Просмотр исходного кода

增加upms后台首页动态系统切换和动态菜单

shuzheng 9 лет назад
Родитель
Сommit
a503a7c17e

+ 0 - 4
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsApiServiceImpl.java

@@ -2,7 +2,6 @@ package com.zheng.upms.rpc.service.impl;
 
 import com.zheng.upms.dao.mapper.UpmsApiMapper;
 import com.zheng.upms.dao.mapper.UpmsUserMapper;
-import com.zheng.upms.dao.mapper.UserVOMapper;
 import com.zheng.upms.dao.model.UpmsPermission;
 import com.zheng.upms.dao.model.UpmsUser;
 import com.zheng.upms.rpc.api.UpmsApiService;
@@ -30,9 +29,6 @@ public class UpmsApiServiceImpl implements UpmsApiService {
     @Autowired
     UpmsApiMapper upmsApiMapper;
 
-    @Autowired
-    UserVOMapper userVOMapper;
-
     /**
      * 根据用户id获取所拥有的权限
      * @param upmsUserId

+ 13 - 2
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/ManageController.java

@@ -1,9 +1,11 @@
 package com.zheng.upms.server.controller;
 
 import com.zheng.common.base.BaseController;
-import com.zheng.upms.dao.model.UpmsSystem;
-import com.zheng.upms.dao.model.UpmsSystemExample;
+import com.zheng.upms.dao.model.*;
+import com.zheng.upms.rpc.api.UpmsApiService;
 import com.zheng.upms.rpc.api.UpmsSystemService;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +29,22 @@ public class ManageController extends BaseController {
 	@Autowired
 	private UpmsSystemService upmsSystemService;
 
+	@Autowired
+	private UpmsApiService upmsApiService;
+
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public String index(ModelMap modelMap) {
+		// 已注册系统
 		UpmsSystemExample upmsSystemExample = new UpmsSystemExample();
 		upmsSystemExample.createCriteria()
 				.andStatusEqualTo((byte) 1);
 		List<UpmsSystem> upmsSystems = upmsSystemService.selectByExample(upmsSystemExample);
 		modelMap.put("upmsSystems", upmsSystems);
+		// 当前登录用户权限
+		Subject subject = SecurityUtils.getSubject();
+		UpmsUser upmsUser = (UpmsUser) subject.getPrincipal();
+		List<UpmsPermission> upmsPermissions = upmsApiService.selectUpmsPermissionByUpmsUserId(upmsUser.getUserId());
+		modelMap.put("upmsPermissions", upmsPermissions);
 		return "/manage/index";
 	}
 

+ 18 - 50
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/index.jsp

@@ -18,7 +18,6 @@
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 	<link href="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet"/>
-	<link href="${basePath}/resources/zheng-admin/plugins/fullPage/jquery.fullPage.css" rel="stylesheet"/>
 	<link href="${basePath}/resources/zheng-admin/css/admin.css" rel="stylesheet"/>
 </head>
 <body>
@@ -32,7 +31,7 @@
 			</div>
 		</li>
 		<li id="logo" class="hidden-xs">
-			<a href="index.jsp">
+			<a href="${basePath}/manage/index">
 				<img src="${basePath}/resources/zheng-admin/images/logo.png"/>
 			</a>
 		</li>
@@ -65,7 +64,7 @@
 						<li class="divider hidden-xs"></li>
 						<c:forEach var="upmsSystem" items="${upmsSystems}">
 						<li>
-							<a class="waves-effect" href="javascript:;"><i class="${upmsSystem.icon}"></i> ${upmsSystem.title}</a>
+							<a class="waves-effect switch-systems" href="javascript:;" systemid="${upmsSystem.systemId}"><i class="${upmsSystem.icon}"></i> ${upmsSystem.title}</a>
 						</li>
 						</c:forEach>
 					</ul>
@@ -131,51 +130,22 @@
 			<li>
 				<a class="waves-effect" href="javascript:Tab.addTab('首页', 'home');"><i class="zmdi zmdi-home"></i> 首页</a>
 			</li>
-			<shiro:hasPermission name="upms:system,upms:organization">
-			<li class="sub-menu">
-				<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-widgets"></i> 系统组织管理</a>
-				<ul>
-					<shiro:hasPermission name="upms:system:read"><li><a class="waves-effect" href="javascript:Tab.addTab('系统管理', '${basePath}/system/index');">系统管理</a></li></shiro:hasPermission>
-					<shiro:hasPermission name="upms:organization:read"><li><a class="waves-effect" href="javascript:Tab.addTab('组织管理', '${basePath}/organization/index');">组织管理</a></li></shiro:hasPermission>
-				</ul>
-			</li>
-			</shiro:hasPermission>
-			<shiro:hasPermission name="upms:user,upms:role">
-			<li class="sub-menu">
-				<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-widgets"></i> 用户角色管理</a>
-				<ul>
-					<shiro:hasPermission name="upms:user:read"><li><a class="waves-effect" href="javascript:Tab.addTab('用户管理', '${basePath}/user/index');">用户管理</a></li></shiro:hasPermission>
-					<shiro:hasPermission name="upms:role:read"><li><a class="waves-effect" href="javascript:Tab.addTab('角色管理', '${basePath}/role/index');">角色管理</a></li></shiro:hasPermission>
-				</ul>
-			</li>
-			</shiro:hasPermission>
-			<shiro:hasPermission name="upms:permission">
-			<li class="sub-menu">
-				<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-widgets"></i> 权限资源管理</a>
-				<ul>
-					<shiro:hasPermission name="upms:role:read"><li><a class="waves-effect" href="javascript:Tab.addTab('权限管理', '${basePath}/permission/index');">权限管理</a></li></shiro:hasPermission>
-				</ul>
-			</li>
-			</shiro:hasPermission>
-			<shiro:hasPermission name="upms:role_permission,upms:user_permission">
-			<li class="sub-menu">
-				<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-widgets"></i> 权限分配管理</a>
-				<ul>
-					<shiro:hasPermission name="upms:role_permission:read"><li><a class="waves-effect" href="javascript:Tab.addTab('角色权限', '${basePath}/role_permission/index');">角色授权</a></li></shiro:hasPermission>
-					<shiro:hasPermission name="upms:user_permission:read"><li><a class="waves-effect" href="javascript:Tab.addTab('用户权限', '${basePath}/user_permission/index');">用户授权</a></li></shiro:hasPermission>
-				</ul>
-			</li>
-			</shiro:hasPermission>
-			<shiro:hasPermission name="upms:coder,upms:session,upms:log">
-			<li class="sub-menu">
-				<a class="waves-effect" href="javascript:;"><i class="zmdi zmdi-widgets"></i> 系统数据管理</a>
-				<ul>
-					<shiro:hasPermission name="upms:coder:read"><li><a class="waves-effect" href="javascript:Tab.addTab('公共码表', '${basePath}/coder/index');">公共码表</a></li></shiro:hasPermission>
-					<shiro:hasPermission name="upms:session:read"><li><a class="waves-effect" href="javascript:Tab.addTab('会话管理', '${basePath}/session/index');">会话管理</a></li></shiro:hasPermission>
-					<shiro:hasPermission name="upms:log:read"><li><a class="waves-effect" href="javascript:Tab.addTab('日志记录', '${basePath}/log/index');">日志记录</a></li></shiro:hasPermission>
-				</ul>
-			</li>
-			</shiro:hasPermission>
+			<c:forEach var="upmsSystem" items="${upmsSystems}" varStatus="status">
+			<c:forEach var="upmsPermission" items="${upmsPermissions}">
+				<c:if test="${upmsPermission.pid == null}">
+				<li class="sub-menu system_menus system_${upmsSystem.systemId}" <c:if test="${status.index != 0}">style="display:none;"</c:if>>
+					<a class="waves-effect" href="javascript:;"><i class="${upmsPermission.icon}"></i> ${upmsPermission.name}</a>
+					<ul>
+						<c:forEach var="subUpmsPermission" items="${upmsPermissions}">
+							<c:if test="${subUpmsPermission.pid == upmsPermission.permissionId}">
+							<li><a class="waves-effect" href="javascript:Tab.addTab('${subUpmsPermission.name}', '${basePath}${subUpmsPermission.uri}');">${subUpmsPermission.name}</a></li>
+							</c:if>
+						</c:forEach>
+					</ul>
+				</li>
+				</c:if>
+			</c:forEach>
+			</c:forEach>
 			<li>
 				<div class="upms-version">&copy; ZHENG-UPMS V1.0.0</div>
 			</li>
@@ -227,8 +197,6 @@
 <script src="${basePath}/resources/zheng-admin/plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
 <script src="${basePath}/resources/zheng-admin/plugins/BootstrapMenu.min.js"></script>
 <script src="${basePath}/resources/zheng-admin/plugins/device.min.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/fullPage/jquery.fullPage.js"></script>
-<script src="${basePath}/resources/zheng-admin/plugins/fullPage/jquery.jdirk.min.js"></script>
 <script src="${basePath}/resources/zheng-admin/js/admin.js"></script>
 </body>
 </html>