ss

VisualInspection/js/role/permision.js

@@ -1,3 +1,30 @@
+var RoleMap = new HashMap()
+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'
+ }];
 $(document).ready(function () {
 
     $("#main_content_title").html("权限管理")
@@ -12,6 +39,62 @@ $(document).ready(function () {
 
      getPermission()
 
+
+
+
+
+     $("#permision_add").on("click", function() {
+         var nodedata = dept_tree.getSelectedNodes();
+         edittype = "add"
+         loadData(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"
+         loadData(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: []
+         }
+     });
+
 });
 
 
@@ -30,7 +113,7 @@ function getPermission() {
      }
 
      function zTreeOnClick(event, treeId, treeNode) {
-         updateUser(treeNode.id)
+         updateRole(treeNode.id)
      };
 
 
@@ -74,7 +157,6 @@ function getPermission() {
      };
 
      PermisionGetAll(function(data) {
-         console.log(data)
          zdata = [];
          for (var i = 0; i < data.length; i++) {
              var m = data[i];
@@ -116,3 +198,31 @@ function getPermission() {
          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) {
+
+         });
+ }

VisualInspection/js/util/const.js

@@ -21,12 +21,20 @@ var DEPT_EDIT = "dept/updateDept/"
 var DEPT_DELETE = "/dept/deleteDept/"
 
 
-// 角色
+// 权限
 var PERMISION_GET_ALL = "/permission/get/all"
+var PERMISION_DELETE = "/permission/deletePermission/"
+var PERMISION_UPDATE = "/permission/updatePermission/"
+var PERMISION_ADD = "/permission/addPermission"
+
+
 
 //角色
 var ROLE_GET_ALL = "/role/get/all/"
 var ROLE_GET_ALL_DATA = "/role/get/alldata/"
+var ROLE_GET_BY_PERMISION = "/role/getRoleByPermision/"
+
+
 
 
 

VisualInspection/js/util/service.js

@@ -118,6 +118,50 @@ function PermisionGetAll(success, fail) {
 }
 
 
+function PermisionAdd(data,success, fail) {
+    var url = base_server_url + PermisionAdd
+    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 PermisionEdit(data,success, fail) {
+    var url = base_server_url + PermisionEdit+data.id
+    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 PermisionDelete(success, fail) {
+    var url = base_server_url + PermisionDelete
+    ajaxDelete(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
+
 
 
 function DeptGetAll(success, fail) {
@@ -279,6 +323,21 @@ function RoleGetALLNoData(success, fail) {
     });
 }
 
+function RoleGetByPermision(permisionid,success, fail) {
+    var url = base_server_url + ROLE_GET_BY_PERMISION+permisionid;
+    ajaxGet(url, "", function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+
 function RoleGetALL(page,size, success, fail) {
     var url = base_server_url + ROLE_GET_ALL_DATA+"/"+page+"/"+size;
     ajaxGet(url, "", function(response) {

VisualInspection/view/role/addpermision.html

@@ -0,0 +1,33 @@
+<!--<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/addpermision.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/role/addpermission.css?__inline">
+
+
+<div class="container-fluid ">
+    <form class="form-horizontal">
+        <div class="form-group">
+            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" id="dept_name" class="form-control" id="code_flag" placeholder="名称">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">上级部门：</label>
+            <div class="col-md-6 col-sm-10">
+                <div id="dept_select">上级部门</div>
+
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+                <button type="button" id="dept_add_btn" class="btn btn-default" onclick="addDept()">添加</button>
+            </div>
+        </div>
+    </form>
+</div>

VisualInspection/view/role/permision.html

@@ -40,3 +40,35 @@
         </div>
     </div>
 </div>
+
+
+<div class="modal fade" id="addModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">添加权限</h4>
+            </div>
+            <div class="modal-body">
+                <link rel="import" href="/view/role/addpermision.html?__inline">
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="addRoleModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">添加角色</h4>
+            </div>
+            <div class="modal-body">
+                <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>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -11,4 +11,5 @@ public class Role {
     private Integer id;
     private String des;
     private String name;
+    private Integer mod;
 }

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

@@ -76,7 +76,6 @@ public class PermissionController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/deletePermission/{permissionid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
     public String deletePermission(@PathVariable Integer permissionid){
         try{

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

@@ -185,5 +185,13 @@ public class RoleController extends BaseController {
 
 		return returnResult(0, "获取成功", roles);
 	}
+	
+	@RequestMapping(value = "/getRoleByPermision/{permisionid}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+	public String getRoleByPermisionidn(@PathVariable Integer permisionid) {
+		List<Role> roles = roleService.getRoleByPermision(permisionid);
+
+		return returnResult(0, "获取成功", roles);
+	}
+
 
 }

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

@@ -33,4 +33,6 @@ public interface RoleDao  {
     
     public void roleUnBindUser(Integer userId);
     
+    public List<Role> getRoleByPermision(Integer permisionid);
+    
 }

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

@@ -5,6 +5,7 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
         <result column="des" property="des" jdbcType="VARCHAR" />
+        <result column="mod" property="mod" jdbcType="INTEGER" />
     </resultMap>
     
      <resultMap id="BaseRoleDaataMap" type="com.xintong.visualinspection.pojo.RoleData" >
@@ -94,6 +95,10 @@
     </select>
     
     
+    <select id="getRoleByPermision" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+       select p.*,s.permission_type as 'mod' from sys_role p,(select * from sys_permission_role where permission_id=#{permisionid,jdbcType=INTEGER}) s where   p.id=s.role_id 
+    </select>
+    
     
     
     

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

@@ -34,4 +34,6 @@ public interface RoleService {
 	public List<RoleData> getRoleDatas(Role role);
 	
 	public void roleUnBindUser(Integer userId);
+	
+	public List<Role> getRoleByPermision(Integer permisionid);
 }

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 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.service.BaseService;
 import com.xintong.visualinspection.service.PermissionService;
 
@@ -29,7 +30,7 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 
     @Autowired
     private PermissionDao permissionDao;
-
+    
 	@Override
 	public List<Permission> getPermissions(Permission permission) {
 		

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

@@ -124,5 +124,9 @@ public class RoleServiceImpl extends BaseService implements RoleService {
 		
 	}
 
+	@Override
+	public List<Role> getRoleByPermision(Integer permisionid){
+		return roleDao.getRoleByPermision(permisionid);
+	}
     
 }

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