权限（勿删除）

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

@@ -19,6 +19,7 @@ import com.xintong.system.err.BusinessException;
 import com.xintong.system.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.pojo.RolePermision;
 import com.xintong.visualinspection.service.AuthService;
 import com.xintong.visualinspection.service.PermissionService;
 import com.xintong.visualinspection.service.UserService;
@@ -51,6 +52,23 @@ public class PermissionController extends BaseController {
     	return returnResult(0, "添加成功", null);
     }
     
+    @RequestMapping(value = "/addRolePermission",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addPermission(@RequestBody RolePermision rolePermision) throws Exception{
+    	permissionService.addrolepermision(rolePermision);
+    	return returnResult(0, "添加成功", null);
+    }
+    
+    @RequestMapping(value = "/deleteRolePermission",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deletePermission(@RequestBody RolePermision rolePermision) throws Exception{
+    	permissionService.deleterolepermision(rolePermision);
+    	return returnResult(0, "刪除成功", null);
+    }
+    @RequestMapping(value = "/updateRolePermission",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateRolePermission(@RequestBody RolePermision rolePermision) throws Exception{
+    	permissionService.updaterolepermision(rolePermision);
+    	return returnResult(0, "更新成功", null);
+    }
+    
     /**
      * 修改权限
      * @return

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/PermissionDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.pojo.RolePermision;
 
 /**
  * 文件名：PermissionDao
@@ -20,4 +21,11 @@ public interface PermissionDao {
     public List<Permission> findByAdminUserId(int userId);
     public List<Permission> getByRoleId(int roleId);
     
+    public void addrolepermision(RolePermision rolePermision);
+    
+    public void deleterolepermision(RolePermision rolePermision);
+    public void updaterolepermision(RolePermision rolePermision);
+    
+    
+    
 }

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

@@ -37,9 +37,9 @@
      <insert id="insert" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" >
         INSERT INTO
         sys_permission
-        (name,descritpion,pid,type,resourceid,status)
+        (name,description,pid,type,resourceid,status)
         VALUES
-        (#{name},#{descritpion},#{pid},#{type},#{resourceid},#{status})
+        (#{name},#{description},#{pid},#{type},#{resourceid},#{status})
     </insert>
     
     
@@ -58,8 +58,7 @@
     </update>
     
      <delete id="delete" parameterType="java.lang.Integer" >
-        update sys_permission
-         set status=-1
+        delete from sys_permission
         WHERE
         id =#{id}
     </delete>
@@ -78,4 +77,27 @@
         SELECT p.* from sys_permission p  where id in (select permission_id from sys_permission_role where role_id=#{roleId});
     </select>
     
+    
+    
+     <insert id="addrolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
+        INSERT INTO
+        sys_permission_role
+        (role_id,permission_id,permission_type)
+        VALUES
+        (#{role_id},#{permission_id},#{permission_type})
+      </insert>
+      
+       <delete id="deleterolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
+        delete from
+        sys_permission_role
+        where role_id=#{role_id} and permission_id=#{permission_id}
+      </delete>
+    
+    
+       <update id="updaterolepermision" parameterType="com.xintong.visualinspection.pojo.RolePermision" >
+        update  
+        sys_permission_role
+        set permission_type = #{permission_type} 
+        where role_id=#{role_id} and permission_id=#{permission_id}
+      </update>
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/pojo/RolePermision.java

@@ -0,0 +1,13 @@
+package com.xintong.visualinspection.pojo;
+
+import lombok.Data;
+
+@Data
+public class RolePermision {
+	
+	private Integer id;
+	private Integer role_id;
+	private Integer permission_id;
+	private Integer permission_type;
+
+}

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

@@ -10,7 +10,7 @@ import com.xintong.visualinspection.bean.User;
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface MenuService {
-    public List<Menu> getMenus(Menu menu,User user);
+    public List<Menu> getMenus(Menu menu,User user,Integer judge);
     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/PermissionService.java

@@ -3,6 +3,7 @@ package com.xintong.visualinspection.service;
 import java.util.List;
 
 import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.pojo.RolePermision;
 
 /**
  * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -15,6 +16,12 @@ public interface PermissionService {
 	public void update(Permission permission);
 
 	public void delete(Integer id);
-	
+
 	public List<Permission> getByRoleId(int roleId);
+
+	public void addrolepermision(RolePermision rolePermision);
+
+	public void deleterolepermision(RolePermision rolePermision);
+
+	public void updaterolepermision(RolePermision rolePermision);
 }

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

@@ -35,10 +35,13 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 	private PermissionDao permissionDao;
 
 	@Override
-	public List<Menu> getMenus(Menu menu,User user) {
+	public List<Menu> getMenus(Menu menu,User user,Integer judge) {
 		
 		List<Menu> menus = 	menuDao.getMenu(menu);
-		menus=getMenusByPermison(menus,user);
+		if(judge==null || judge.intValue()==0){
+			menus=getMenusByPermison(menus,user);
+		}
+		
 		
 		List<Menu> mlist = 	new ArrayList<>();
 		
@@ -61,7 +64,7 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 		//找出子
 		for (Integer mid : map.keySet()) {
 			for (Menu m2 : menus) {
-				if(m2.getId()==mid){
+				if(m2.getId().intValue()==mid.intValue()){
 					m2.setChilds(map.get(mid));
 					if(m2.getParentId()==null){
 						mlist.add(m2);

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

@@ -13,6 +13,7 @@ import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
+import com.xintong.visualinspection.pojo.RolePermision;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.PermissionService;
 
@@ -83,5 +84,20 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 		return permissionDao.getByRoleId(roleId);
 	}
 
+	@Override
+	public void addrolepermision(RolePermision rolePermision) {
+		permissionDao.addrolepermision(rolePermision);
+	}
+
+	@Override
+	public void deleterolepermision(RolePermision rolePermision) {
+		permissionDao.deleterolepermision(rolePermision);
+	}
+
+	@Override
+	public void updaterolepermision(RolePermision rolePermision) {
+		permissionDao.updaterolepermision(rolePermision);
+	}
+
   
 }