权限添加

VisualInspection/js/lib/treeSelect.js

@@ -51,7 +51,15 @@ var TreeSelect = (function() {
             //input.val(self.text);
             return false;
         });
+  
+       
+
         input.click(function() {
+             if(typeof(options.enable)!="undefined" && options.enable!=null){
+                 if(!options.enable){
+                     return;
+                 }
+            }
             if (!self.isOpen()) {
                 self.open();
             } else {

VisualInspection/js/role/addrolepermision.js

@@ -1,10 +1,14 @@
 var role_selectinput;
 var permision_id;
-function loadPermisionRoleData(nodedata) {
+var roletemp = null;
+function loadPermisionRoleData(nodedata, roleid) {
     var pnode = nodedata;
     permision_id = pnode[0].id
-
-    console.error(nodedata)
+    $("#permission_mod").val("");
+    if (roleid != 0) {
+        roletemp = RoleMap.get(parseInt(roleid));
+        $("#permission_mod").val(roletemp.mod);
+    }
 
     getRole();
 
@@ -15,6 +19,8 @@ function loadPermisionRoleData(nodedata) {
     })
 }
 
+
+
 function getRole() {
 
     RoleGetALLNoData(function (data) {
@@ -27,13 +33,19 @@ function getRole() {
             zdataItem["name"] = m.des;
             roles.push(zdataItem);
         }
+        var enabbleedit = true;
+        if (edittype == "edit") {
+            enabbleedit = false;
+        }
+
 
         role_selectinput = new TreeSelect({
             element: '#role_select',
             data: roles,
             valueKey: "id",
-            placeholder: "选择权限",
-            selectvalue: null
+            placeholder: "选择角色",
+            enable: enabbleedit,
+            selectvalue: roletemp == null ? null : roletemp.id
         });
     }, function (error) {
 
@@ -52,18 +64,30 @@ function addroleper() {
         "permission_id": permision_id1,
         "permission_type": mod
     }
+    if (edittype == "edit") {
+        PermisionRoleEDIT(data, function (data) {
+            layer.msg('更新成功！', {
+                time: 2000, //20s后自动关闭
+            }, function () {
+                $('#addRoleModal').modal('hide')
+                updateRole(permision_id);
+            });
+        }, function (error) {
+
+        })
+
+    } else {
+        PermisionRoleAdd(data, function (data) {
+            layer.msg('添加成功！', {
+                time: 2000, //20s后自动关闭
+            }, function () {
+                $('#addRoleModal').modal('hide')
+                updateRole(permision_id);
+            });
+        }, function (error) {
+
+        })
+    }
 
-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,5 +1,6 @@
 var RoleMap = new HashMap()
 var PermisionMap = new HashMap()
+var edittype = "add"
 var zdata = [];
 var cols = [{
     width: 10,
@@ -73,14 +74,14 @@ $(document).ready(function () {
     });
     $("#role_add").on("click", function () {
         var nodedata = dept_tree.getSelectedNodes();
-       
-         if (nodedata.length < 1) {
+        edittype = "add"
+        if (nodedata.length < 1) {
             layer.msg('请先选择权限！', {
                 time: 2000, //20s后自动关闭
             });
             return;
         }
-         loadPermisionRoleData(nodedata)
+        loadPermisionRoleData(nodedata,0)
         $('#addRoleModal').modal('show');
     });
 
@@ -93,6 +94,35 @@ $(document).ready(function () {
         }
     });
 
+    $('.datatable').on('click', 'button', function () {
+        if (this.name == "user_edit") {
+             var nodedata = dept_tree.getSelectedNodes();
+            edittype = "edit"
+            var user = nodedata
+            loadPermisionRoleData(user,this.id)
+            $('#addRoleModal').modal('show')
+        }
+        if (this.name == "user_delete") {
+            var nodedata = dept_tree.getSelectedNodes();
+            var data = {
+                "role_id":this.id,
+                "permission_id":nodedata[0].id
+            }
+            PermisionRoleDELETE(data, function (data) {
+                layer.msg('角色删除成功！', {
+                    time: 2000, //20s后自动关闭
+                }, function () {
+                    var nodedata = dept_tree.getSelectedNodes();
+                    updateRole(nodedata[0].id)
+                });
+            },
+                function (error) {
+
+                })
+        }
+
+    });
+
 });
 
 
@@ -214,6 +244,8 @@ function updateRole(permisionid) {
                 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);
+
+                RoleMap.set(role.id,role);
             }
         }
         // 使用data参数更新数据：

VisualInspection/js/util/const.js

@@ -27,6 +27,9 @@ var PERMISION_DELETE = "/permission/deletePermission/"
 var PERMISION_UPDATE = "/permission/updatePermission/"
 var PERMISION_ADD = "/permission/addPermission"
 var PERMISION_ROLE_ADD = "/permission/addRolePermission"
+var PERMISION_ROLE_EDIT = "/permission/updateRolePermission"
+var PERMISION_ROLE_DELETE = "/permission/deleteRolePermission"
+
 
 
 

VisualInspection/js/util/service.js

@@ -131,6 +131,36 @@ function PermisionRoleAdd(data,success, fail) {
     });
 }
 
+function PermisionRoleEDIT(data,success, fail) {
+    var url = base_server_url + PERMISION_ROLE_EDIT
+    ajaxPut(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 PermisionRoleDELETE(data,success, fail) {
+    var url = base_server_url + PERMISION_ROLE_DELETE
+    ajaxDelete(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) {

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

@@ -58,6 +58,17 @@ public class PermissionController extends BaseController {
     	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

@@ -23,4 +23,9 @@ public interface PermissionDao {
     
     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

@@ -86,5 +86,18 @@
         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/service/PermissionService.java

@@ -16,8 +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/PermissionServiceImpl.java

@@ -87,7 +87,16 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 	@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);
 	}
 
   

VisualInspection_server/src/main/resources/application.properties

@@ -2,16 +2,16 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -52,11 +52,11 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-#spring.redis.host=10.112.0.199
-spring.redis.host=git.topm.win
+spring.redis.host=10.112.0.199
+#spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6380
-#spring.redis.port=6379  
+#spring.redis.port=6380
+spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09