aa

VisualInspection/js/role/addrolepermision.js

@@ -0,0 +1,69 @@
+var role_selectinput;
+var permision_id;
+function loadPermisionRoleData(nodedata) {
+    var pnode = nodedata;
+    permision_id = pnode[0].id
+
+    console.error(nodedata)
+
+    getRole();
+
+
+    $("#role_add_btn").on("click", function () {
+
+        addroleper();
+    })
+}
+
+function getRole() {
+
+    RoleGetALLNoData(function (data) {
+
+        roles = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["name"] = m.des;
+            roles.push(zdataItem);
+        }
+
+        role_selectinput = new TreeSelect({
+            element: '#role_select',
+            data: roles,
+            valueKey: "id",
+            placeholder: "选择权限",
+            selectvalue: null
+        });
+    }, function (error) {
+
+    });
+
+
+
+}
+
+function addroleper() {
+    var permision_id1 = permision_id;
+    var role_id = role_selectinput.value;
+    var mod = $("#permission_mod").val();
+    var data = {
+        "role_id": role_id,
+        "permission_id": permision_id1,
+        "permission_type": mod
+    }
+
+console.log(data)
+
+    PermisionRoleAdd(data, function (data) {
+        layer.msg('添加成功！', {
+            time: 2000, //20s后自动关闭
+        }, function () {
+            $('#addRoleModal').modal('hide')
+            updateRole(permision_id);
+        });
+    }, function (error) {
+
+    })
+
+}

VisualInspection/js/role/permision.js

@@ -1,217 +1,229 @@
 var RoleMap = new HashMap()
 var PermisionMap = new HashMap()
-var zdata=[];
+var zdata = [];
 var cols = [{
-     width: 10,
-     text: '序号',
-     type: 'number',
-     flex: true,
-     colClass: 'text-center'
- }, {
-     width: 30,
-     text: '角色',
-     type: 'string',
-     flex: true,
-     colClass: 'text-center'
- }, {
-     width: 30,
-     text: '操作权限',
-     type: 'string',
-     flex: true,
-     sort: 'down',
-     colClass: 'text-center'
- },{
-     width: 140,
-     text: '操作',
-     type: 'string',
-     flex: true,
-     colClass: 'text-center'
- }];
+    width: 10,
+    text: '序号',
+    type: 'number',
+    flex: true,
+    colClass: 'text-center'
+}, {
+    width: 30,
+    text: '角色',
+    type: 'string',
+    flex: true,
+    colClass: 'text-center'
+}, {
+    width: 30,
+    text: '操作权限',
+    type: 'string',
+    flex: true,
+    sort: 'down',
+    colClass: 'text-center'
+}, {
+    width: 140,
+    text: '操作',
+    type: 'string',
+    flex: true,
+    colClass: 'text-center'
+}];
 $(document).ready(function () {
-     $("#main_content_title").html("权限管理")
-     $('#dashboard').dashboard({ draggable: true });
-     var zTreeObj;
-     var zNodes = [];
-     dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
-     getPermission()
-     $("#permision_add").on("click", function() {
-         var nodedata = dept_tree.getSelectedNodes();
-         edittype = "add"
-         loadPermisionData(nodedata)
-         $('#addModal').modal('show')
-     })
-     $("#permision_edit").on("click", function() {
-         //获取选中的节点
-         var nodedata = dept_tree.getSelectedNodes();
+    $("#main_content_title").html("权限管理")
+    $('#dashboard').dashboard({ draggable: true });
+    var zTreeObj;
+    var zNodes = [];
+    dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
+    getPermission()
+    $("#permision_add").on("click", function () {
+        var nodedata = dept_tree.getSelectedNodes();
+        edittype = "add"
+        loadPermisionData(nodedata)
+        $('#addModal').modal('show')
+    })
+    $("#permision_edit").on("click", function () {
+        //获取选中的节点
+        var nodedata = dept_tree.getSelectedNodes();
+        if (nodedata.length < 1) {
+            layer.msg('请先选择权限！', {
+                time: 2000, //20s后自动关闭
+            });
+            return;
+        }
+        edittype = "edit"
+        loadPermisionData(nodedata)
+        $('#addModal').modal('show');
+    });
+    $("#permision_delete").on("click", function () {
+        //获取选中的节点
+        var nodedata = dept_tree.getSelectedNodes();
+        if (nodedata.length < 1) {
+            layer.msg('请先选择权限！', {
+                time: 2000, //20s后自动关闭
+            });
+            return;
+        }
+        PermisionDelete(nodedata[0].id, function (data) {
+            layer.msg('删除成功！', {
+                time: 2000, //20s后自动关闭
+            });
+            dept_tree.removeNode(nodedata[0]);
+        }, function (error) {
+
+        });
+    });
+    $("#role_add").on("click", function () {
+        var nodedata = dept_tree.getSelectedNodes();
+       
          if (nodedata.length < 1) {
-             layer.msg('请先权限！', {
-                 time: 2000, //20s后自动关闭
-             });
-             return;
-         }
-         edittype = "edit"
-         loadPermisionData(nodedata)
-         $('#addModal').modal('show');
-     });
-     $("#permision_delete").on("click", function() {
-         //获取选中的节点
-         var nodedata = dept_tree.getSelectedNodes();
-         if (nodedata.length < 1) {
-             layer.msg('请先选择部门！', {
-                 time: 2000, //20s后自动关闭
-             });
-             return;
-         }
-         PermisionDelete(nodedata[0].id, function(data) {
-             layer.msg('删除成功！', {
-                 time: 2000, //20s后自动关闭
-             });
-             dept_tree.removeNode(nodedata[0]);
-         }, function(error) {
-
-         });
-     });
-     $('.datatable').datatable({
-         checkable: false,
-         sortable: false,
-         data: {
-             cols: cols,
-             rows: []
-         }
-     });
+            layer.msg('请先选择权限！', {
+                time: 2000, //20s后自动关闭
+            });
+            return;
+        }
+         loadPermisionRoleData(nodedata)
+        $('#addRoleModal').modal('show');
+    });
+
+    $('.datatable').datatable({
+        checkable: false,
+        sortable: false,
+        data: {
+            cols: cols,
+            rows: []
+        }
+    });
 
 });
 
 
 
 function getPermission() {
-     function zTreeOnRename(event, treeId, treeNode, isCancel) {
-         alert(treeNode.tId + ", " + treeNode.name);
-     }
-
-     //  function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
-     //      return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
-     //  };
-
-     function zTreeOnRemove(event, treeId, treeNode) {
-         alert(treeNode.tId + ", " + treeNode.name);
-     }
-
-     function zTreeOnClick(event, treeId, treeNode) {
-         updateRole(treeNode.id)
-     };
-
-
-     var setting = {
-         data: {
-             simpleData: {
-                 enable: true,
-                 idKey: "id",
-                 pIdKey: "pId",
-                 rootPId: null
-             }
-         },
-         view: { //表示tree的显示状态
-             selectMulti: false //表示禁止多选
-         },
-         check: { //表示tree的节点在点击时的相关设置
-             enable: false, //是否显示radio/checkbox
-             chkStyle: "checkbox", //值为checkbox或者radio表示
-             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
-             radioType: "level" //设置tree的分组
-         },
-         callback: {
-             onRename: zTreeOnRename,
-             //  beforeDrop: zTreeBeforeDrop,
-             onRemove: zTreeOnRemove,
-             onClick: zTreeOnClick
-         },
-         edit: {
-             enable: true,
-             drag: {
-                 autoExpandTrigger: true,
-                 isMove: true,
-                 prev: false,
-                 next: true,
-                 inner: true,
-                 autoOpenTime: 0
-             },
-             showRenameBtn: false,
-             showRemoveBtn: false
-         }
-     };
-
-     PermisionGetAll(function(data) {
-         zdata = [];
-         for (var i = 0; i < data.length; i++) {
-             var m = data[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = null;
-             zdataItem["name"] = m.name;
-             zdataItem["open"] = true;
-             zdataItem["children"] = addobj(m);
-             zdata.push(zdataItem);
-
-             PermisionMap.set(m.id,m);
-         }
-         dept_tree = $.fn.zTree.init($("#permision_tree"), setting, zdata)
-     }, function(error) {
-
-     });
- }
-
-
-
- function addobj(data) {
-     var zdata = [];
-     if (typeof(data.childs) != "undefined" && data.childs != null &&
-         data.childs.length > 0) {
-         for (var i = 0; i < data.childs.length; i++) {
-             var m = data.childs[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = data.id;
-             zdataItem["icon"] = "";
-             zdataItem["open"] = true;
-             zdataItem["name"] = m.name;
-             zdataItem["children"] = addobj(m);
-             zdata.push(zdataItem);
-
-             PermisionMap.set(m.id,m);
-         }
-         return zdata;
-     } else {
-         return [];
-     }
- }
+    function zTreeOnRename(event, treeId, treeNode, isCancel) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+    //  function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+    //      return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+    //  };
+
+    function zTreeOnRemove(event, treeId, treeNode) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+    function zTreeOnClick(event, treeId, treeNode) {
+        updateRole(treeNode.id)
+    };
+
+
+    var setting = {
+        data: {
+            simpleData: {
+                enable: true,
+                idKey: "id",
+                pIdKey: "pId",
+                rootPId: null
+            }
+        },
+        view: { //表示tree的显示状态
+            selectMulti: false //表示禁止多选
+        },
+        check: { //表示tree的节点在点击时的相关设置
+            enable: false, //是否显示radio/checkbox
+            chkStyle: "checkbox", //值为checkbox或者radio表示
+            checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+            radioType: "level" //设置tree的分组
+        },
+        callback: {
+            onRename: zTreeOnRename,
+            //  beforeDrop: zTreeBeforeDrop,
+            onRemove: zTreeOnRemove,
+            onClick: zTreeOnClick
+        },
+        edit: {
+            enable: true,
+            drag: {
+                autoExpandTrigger: true,
+                isMove: true,
+                prev: false,
+                next: true,
+                inner: true,
+                autoOpenTime: 0
+            },
+            showRenameBtn: false,
+            showRemoveBtn: false
+        }
+    };
+
+    PermisionGetAll(function (data) {
+        zdata = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = null;
+            zdataItem["name"] = m.name;
+            zdataItem["open"] = true;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+
+            PermisionMap.set(m.id, m);
+        }
+        dept_tree = $.fn.zTree.init($("#permision_tree"), setting, zdata)
+    }, function (error) {
+
+    });
+}
+
+
+
+function addobj(data) {
+    var zdata = [];
+    if (typeof (data.childs) != "undefined" && data.childs != null &&
+        data.childs.length > 0) {
+        for (var i = 0; i < data.childs.length; i++) {
+            var m = data.childs[i];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = data.id;
+            zdataItem["icon"] = "";
+            zdataItem["open"] = true;
+            zdataItem["name"] = m.name;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+
+            PermisionMap.set(m.id, m);
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}
 function updateRole(permisionid) {
 
-     RoleGetByPermision(permisionid, function(data) {
-             //跟新table
-             console.log(data)
-             var rowdata = [];
-             if (data != null && data.length > 0) {
-                 for (var i = 0; i < data.length; i++) {
-                     var role = data[i];
-                  
-                     RoleMap.set(role.id, role)
-                     var roledata = {};
-                     roledata["checked"] = false;
-                     roledata["data"] = [i + 1, role.des, role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
-                     rowdata.push(roledata);
-                 }
-             }
-             // 使用data参数更新数据：
-             $('.datatable').datatable('load', {
-                 cols: cols,
-                 rows: rowdata
-             });
-
-         },
-         function(error) {
-
-         });
- }
+    RoleGetByPermision(permisionid, function (data) {
+        //跟新table
+        var rowdata = [];
+        if (data != null && data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+                var role = data[i];
+
+                RoleMap.set(role.id, role)
+                var roledata = {};
+                roledata["checked"] = false;
+                roledata["data"] = [i + 1, role.des, role.mod, '<button class="btn btn-primary" name="user_edit" id=' + role.id + '><i class="icon icon-edit"></i>修改</button>  <button class="btn btn-primary" name="user_delete" id=' + role.id + ' ><i class="icon icon-remove-circle"></i>删除</button>'];
+                rowdata.push(roledata);
+            }
+        }
+        // 使用data参数更新数据：
+        $('.datatable').datatable('load', {
+            cols: cols,
+            rows: rowdata
+        });
+
+    },
+        function (error) {
+
+        });
+}

VisualInspection/js/role/role.js

@@ -51,7 +51,6 @@ $(document).ready(function () {
 function getrole(size, page) {
     RoleGetALL(page, size, function (data) {
 
-console.log(data)
         totalPage = data.pages;
         totalRecords = data.total;
         setpage(data.currentPage);

VisualInspection/js/util/const.js

@@ -26,6 +26,9 @@ var PERMISION_GET_ALL = "/permission/get/all"
 var PERMISION_DELETE = "/permission/deletePermission/"
 var PERMISION_UPDATE = "/permission/updatePermission/"
 var PERMISION_ADD = "/permission/addPermission"
+var PERMISION_ROLE_ADD = "/permission/addRolePermission"
+
+
 
 
 

VisualInspection/js/util/service.js

@@ -117,6 +117,21 @@ function PermisionGetAll(success, fail) {
     });
 }
 
+function PermisionRoleAdd(data,success, fail) {
+    var url = base_server_url + PERMISION_ROLE_ADD
+    ajaxPost(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
 
 function PermisionAdd(data,success, fail) {
     var url = base_server_url + PERMISION_ADD

VisualInspection/view/role/addrolepermision.html

@@ -0,0 +1,28 @@
+<!--<script type="text/javascript" src="/node_modules/zui/dist/lib/chosen/chosen.min.js?__inline">
+</script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosen/chosen.min.css">
+<script type="text/javascript" src="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.js?__inline">
+</script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.css">-->
+<script type="text/javascript" src="/js/role/addrolepermision.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/role/addrolepermision.css?__inline">
+
+
+<div class="container-fluid ">
+    <form class="form-horizontal">
+       
+
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">角色：</label>
+            <div class="col-md-6 col-sm-10">
+                <div id="role_select">角色</div>
+            </div>
+        </div>
+         <div class="form-group">
+            <label for="exampleInputAccount4" class="col-sm-2">权限：</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" id="permission_mod" class="form-control" id="code_flag" placeholder="1-读写 2-读 3-删除 ">
+            </div>
+        </div>
+    </form>
+</div>

VisualInspection/view/role/permision.html

@@ -72,7 +72,7 @@
                 <link rel="import" href="/view/role/addrolepermision.html?__inline">
             </div>
             <div class="modal-footer">
-                <button type="button" id="user_add_btn" class="btn btn-primary">保存</button>
+                <button type="button" id="role_add_btn" class="btn btn-primary">保存</button>
             </div>
         </div>
     </div>

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,12 @@ 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);
+    }
+    
     /**
      * 修改权限
      * @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,6 @@ public interface PermissionDao {
     public List<Permission> findByAdminUserId(int userId);
     public List<Permission> getByRoleId(int roleId);
     
+    public void addrolepermision(RolePermision rolePermision);
+    
 }

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

@@ -77,4 +77,14 @@
         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>
+    
 </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/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 版权所有.
@@ -17,4 +18,6 @@ public interface PermissionService {
 	public void delete(Integer id);
 	
 	public List<Permission> getByRoleId(int roleId);
+	
+	public void addrolepermision(RolePermision rolePermision);
 }

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,11 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 		return permissionDao.getByRoleId(roleId);
 	}
 
+	@Override
+	public void addrolepermision(RolePermision rolePermision) {
+		permissionDao.addrolepermision(rolePermision);
+		
+	}
+
   
 }