菜单权限判定

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-var base_ui_url = "http://192.168.68.126:8081/";
-var base_server_url = "http://192.168.68.126:8089/";
-var base_image_server_url = "http://192.168.68.126:8080/";
+// var base_ui_url = "http://192.168.68.126:8081/";
+// var base_server_url = "http://192.168.68.126:8089/";
+var base_image_server_url = "http://10.112.0.236:8088/";
 
-// var base_ui_url = "http://localhost:8081/";
-// var base_server_url = "http://localhost:8089/";
+var base_ui_url = "http://localhost:8080/";
+var base_server_url = "http://localhost:8089/";

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Permission.java

@@ -20,5 +20,7 @@ public class Permission {
 	private int type;
 	// 0 正常 -1 删除
 	private int status;
+	//1-读写 2-读 3-删除 
+	private int permission_type;
 
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Role.java

@@ -9,5 +9,6 @@ import lombok.Data;
 @Data
 public class Role {
     private Integer id;
+    private String des;
     private String name;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -1,6 +1,11 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +19,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Menu;
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.service.MenuService;
 
 /**
@@ -32,6 +40,7 @@ public class MenuController extends BaseController {
     private MenuService menuService;
     
     
+    
     /**
      * 添加菜单
      * @return
@@ -90,10 +99,10 @@ public class MenuController extends BaseController {
      */
 
     @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllMenu(){
+    public String getAllMenu(HttpServletRequest request){
         try{
-        
-        	List<Menu> menus= menuService.getMenus(new Menu());
+        	User u = getCurrentUser(request);
+        	List<Menu> menus= menuService.getMenus(new Menu(),u);
         	return returnResult(0, "获取成功", menus);
         }catch(Exception e){
         	throw new BusinessException(20001);
@@ -115,13 +124,13 @@ public class MenuController extends BaseController {
     }
     
     @RequestMapping(value = "/getMenuById/{menuid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getMenuById(@PathVariable Integer menuid){
+    public String getMenuById(@PathVariable Integer menuid,HttpServletRequest request){
         try{
-        	
+        	User u = getCurrentUser(request);
         	Menu menu = new Menu();
         	menu.setId(menuid);
         	
-        	List<Menu> menus = menuService.getMenus(menu);
+        	List<Menu> menus = menuService.getMenus(menu,u);
         	if(menus==null||menus.size()<1 ) throw  new BusinessException(20001);
         	return returnResult(0, "获取成功", menus.get(0));
         }catch(Exception e){
@@ -130,6 +139,8 @@ public class MenuController extends BaseController {
     }
     
     
+   
+    
     
 
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/PermissionDaoMapper.xml

@@ -9,7 +9,8 @@
         <result column="pid" property="pid" jdbcType="INTEGER" />
         <result column="type" property="type" jdbcType="INTEGER" />     
         <result column="resourceid" property="resourceid" jdbcType="INTEGER" />  
-        <result column="status" property="status" jdbcType="INTEGER" />        
+        <result column="status" property="status" jdbcType="INTEGER" />     
+         <result column="permission_type" property="permission_type" jdbcType="INTEGER" />
     </resultMap>
 
 
@@ -64,7 +65,7 @@
     </delete>
 
     <select id="findByAdminUserId" parameterType="int" resultType="com.xintong.visualinspection.bean.Permission">
-        select p.*
+      select p.*,spr.permission_type 
         from sys_permission p
         LEFT JOIN sys_role_user sru on sru.sys_user_id = #{userId}
         LEFT JOIN sys_role r on sru.sys_role_id=r.id

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/RoleMapper.xml

@@ -4,12 +4,13 @@
     <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Role" >
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="des" property="des" jdbcType="VARCHAR" />
     </resultMap>
     
     
      <select id="getRole" parameterType="com.xintong.visualinspection.bean.Role" resultMap="BaseResultMap">
         SELECT 
-        id,name,status 
+        * 
          FROM sys_role
          where 1=1
          <if test="id != null and id != 0">and id = #{id}</if>
@@ -20,9 +21,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Role" >
         INSERT INTO
         sys_role
-        (name)
+        (name,des)
         VALUES
-        (#{name})
+        (#{name},#{des})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.Role" >
@@ -30,6 +31,7 @@
         sys_role
         SET
         <if test="name != null">name = #{name},</if>
+        <if test="des != null">des = #{des},</if>
         id = #{id}
         WHERE
         id = #{id}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/MenuService.java

@@ -3,13 +3,14 @@ package com.xintong.visualinspection.service;
 import java.util.List;
 
 import com.xintong.visualinspection.bean.Menu;
+import com.xintong.visualinspection.bean.User;
 
 /**
  * 文件名：UserService
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface MenuService {
-    public List<Menu> getMenus(Menu menu);
+    public List<Menu> getMenus(Menu menu,User user);
     public List<Menu> getMenuByParent(Menu menu);
     public void insert(Menu menu);
     public void update(Menu menu);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/AuthServiceImpl.java

@@ -54,7 +54,6 @@ public class AuthServiceImpl extends BaseService implements AuthService {
 	        UsernamePasswordAuthenticationToken upToken = new UsernamePasswordAuthenticationToken(username, password);
 	        final Authentication authentication = authenticationManager.authenticate(upToken);
 	        SecurityContextHolder.getContext().setAuthentication(authentication);
-
 	        User userDetails =(User) userDetailsService.loadUserByUsername(username);
 	        
 	        final String token = jwtTokenUtil.generateToken(userDetails);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -10,7 +10,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.Menu;
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.MenuDao;
+import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.MenuService;
 
@@ -28,11 +31,14 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 
 	@Autowired
 	private MenuDao menuDao;
+	@Autowired
+	private PermissionDao permissionDao;
 
 	@Override
-	public List<Menu> getMenus(Menu menu) {
+	public List<Menu> getMenus(Menu menu,User user) {
 		
 		List<Menu> menus = 	menuDao.getMenu(menu);
+		menus=getMenusByPermison(menus,user);
 		
 		List<Menu> mlist = 	new ArrayList<>();
 		
@@ -88,5 +94,25 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 		List<Menu> menus = 	menuDao.getMenuByParent(menu);
 		return menus;
 	}
+	
+	
+	 private List<Menu> getMenusByPermison(List<Menu> menus,User user){
+	    	//判断有权限的资源
+	    	//获取权限资源
+	    	List<Permission> permissions= permissionDao.findByAdminUserId(user.getId());
+	    	Map<Integer,Permission> pmap = new HashMap<>();
+	    	for(Permission p : permissions){
+	    		pmap.put(p.getResourceid(), p);
+	    	}
+	    	List<Menu> menulist = new ArrayList<>();
+	    	for(Menu m : menus){
+	    		//为有权限的资源
+	    		if(pmap.get(m.getId())!=null && pmap.get(m.getId()).getPermission_type()==1){
+	    			menulist.add(m);
+	    		}
+	    	}
+
+	    	return menulist;
+	    }
 
 }