aa

VisualInspection/.vscode/settings.json

@@ -0,0 +1,3 @@
+// 将设置放入此文件中以覆盖默认值和用户设置。
+{
+}

VisualInspection/js/role/permision.js

@@ -0,0 +1,118 @@
+$(document).ready(function () {
+
+    $("#main_content_title").html("权限管理")
+
+
+
+    
+     $('#dashboard').dashboard({ draggable: true });
+     var zTreeObj;
+     var zNodes = [];
+     dept_tree = $.fn.zTree.init($("#permision_tree"), {}, zNodes);
+
+     getPermission()
+
+});
+
+
+
+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) {
+         updateUser(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) {
+         console.log(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);
+         }
+         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);
+         }
+         return zdata;
+     } else {
+         return [];
+     }
+ }

VisualInspection/js/user/addUser.js

@@ -50,7 +50,7 @@ function resetform() {
     $("#user_workno").val("");
     $("#user_password").val("");
     $("#user_confirm_password").val("")
-    $("#user_birth").val("")
+    // $("#user_birth").val("")
     $("#user_mobile").val("")
     $("#user_position").val("")
     $("#user_idno").val("")
@@ -68,7 +68,7 @@ function initUserInfo() {
     $("#user_workno").val(usertemp.workno);
     $("#user_password").val(usertemp.password);
     $("#user_confirm_password").val(usertemp.password)
-    $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
+    // $("#user_birth").val(moment.unix(usertemp.birth / 1000).format("YYYY-MM-DD"))
     $("#user_mobile").val(usertemp.mobile)
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
@@ -134,7 +134,7 @@ function addUser() {
     var usermobile = $("#user_mobile").val();
     var useridno = $("#user_idno").val();
     var useremail = $("#user_email").val();
-    var userbirth = $("#user_birth").val();
+    // var userbirth = $("#user_birth").val();
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();

VisualInspection/js/util/const.js

@@ -20,6 +20,10 @@ var DEPT_ADD = "dept/addDept"
 var DEPT_EDIT = "dept/updateDept/"
 var DEPT_DELETE = "/dept/deleteDept/"
 
+
+// 角色
+var PERMISION_GET_ALL = "/permission/get/all"
+
 //角色
 var ROLE_GET_ALL = "/role/get/all/"
 var ROLE_GET_ALL_DATA = "/role/get/alldata/"

VisualInspection/js/util/service.js

@@ -103,6 +103,23 @@ function MenuGetAll(success, fail) {
     });
 }
 
+function PermisionGetAll(success, fail) {
+    var url = base_server_url + PERMISION_GET_ALL
+    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 DeptGetAll(success, fail) {
     var url = base_server_url + DEPT_GET_ALL
     ajaxGet(url, "", function(response) {

VisualInspection/view/role/permision.html

@@ -0,0 +1,42 @@
+<link rel="stylesheet" type="text/css" href="/css/role/permision.css?__inline">
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
+<script type="text/javascript" src="/js/role/permision.js?__inline"></script>
+<div class="container-fluid ">
+    <div id="dashboard" class="dashboard dashboard-draggable" data-height="500">
+        <div class="row">
+            <div class="col-md-3">
+                <div class="panel" data-id="1">
+                    <div class="panel-heading">
+                        <span class="title">权限列表</span>
+                        <div class="panel-actions">
+                            <button type="button" class="btn" id="permision_add" data-position="center" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
+                            <button type="button" class="btn" id="permision_edit" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
+                            <button type="button" class="btn" id="permision_delete" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
+                        </div>
+                    </div>
+                    <div class="panel-body">
+                        <ul id="permision_tree" class="ztree">
+
+                        </ul>
+                    </div>
+                </div>
+
+            </div>
+            <div class="col-md-9">
+                <div class="panel" data-id="3">
+                    <div class="panel-heading">
+                        <span class="title">角色列表</span>
+                        <div class="panel-actions">
+                            <button type="button" class="btn" id="role_add" data-toggle="tooltip" title="添加角色"><i class="icon-plus"></i></button>
+                        </div>
+                    </div>
+                    <div class="panel-body no-padding" style="padding:0">
+                        <div class="datatable" data-checkable="true" data-sortable="true"></div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>

VisualInspection/view/user/addUser.html

@@ -68,12 +68,12 @@
 
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">生日：</label>
             <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_birth" class="form-control" placeholder="生日">
             </div>
-        </div>
+        </div>-->
 
 
         <div class="form-group">

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

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.bean;
 
+import java.util.List;
+
 import lombok.Data;
 
 /**
@@ -7,20 +9,21 @@ import lombok.Data;
  */
 @Data
 public class Permission {
-	private int id;
+	private Integer id;
 	// 权限名称
 	private String name;
 	// 权限描述
-	private String descritpion;
+	private String description;
 	// 父节点id
-	private int pid;
+	private Integer pid;
 	// 资源id
-	private int resourceid;
+	private Integer resourceid;
 	// 类型 1-菜单
-	private int type;
+	private Integer type;
 	// 0 正常 -1 删除
-	private int status;
+	private Integer status;
 	//1-读写 2-读 3-删除 
-	private int permission_type;
+	private Integer permission_type;
 
+	private List<Permission> childs;
 }

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

@@ -93,14 +93,12 @@ public class PermissionController extends BaseController {
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllPermission(@PathVariable Integer page,@PathVariable Integer size ){
-        try{
-        	PageHelper.startPage(page, size); 
+    @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAllPermission(){
+        try{ 
         	List<Permission> permissions= permissionService.getPermissions(new  Permission());
         	
-        	return returnResult(0, "获取成功", new PageInfo(permissions));
+        	return returnResult(0, "获取成功", permissions);
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

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

@@ -5,7 +5,7 @@
   <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Permission" >
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
-        <result column="descritpion" property="descritpion" jdbcType="VARCHAR" />
+        <result column="description" property="description" jdbcType="VARCHAR" />
         <result column="pid" property="pid" jdbcType="INTEGER" />
         <result column="type" property="type" jdbcType="INTEGER" />     
         <result column="resourceid" property="resourceid" jdbcType="INTEGER" />  
@@ -22,12 +22,12 @@
     
      <select id="getPermission" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" resultMap="BaseResultMap">
         SELECT 
-        id,name,descritpion,pid,type,resourceid,status 
+        id,name,description,pid,type,resourceid,status 
          FROM sys_permission
          where 1=1
          <if test="id != null and id != 0">and id = #{id}</if>
          <if test="name != null">and name = #{name}</if>
-         <if test="descritpion != null">and descritpion = #{descritpion}</if>
+         <if test="description != null">and description = #{description}</if>
          <if test="pid != null and pid != 0">and pid = #{pid}</if>
          <if test="type != null and type != 0">and type = #{type}</if>
          <if test="resourceid != null and resourceid != 0">and resourceid = #{resourceid}</if>

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

@@ -1,10 +1,15 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 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.service.BaseService;
@@ -22,11 +27,39 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(PermissionService.class);
 
+    @Autowired
     private PermissionDao permissionDao;
 
 	@Override
 	public List<Permission> getPermissions(Permission permission) {
-		return permissionDao.getPermission(permission);
+		
+		List<Permission> permisions = permissionDao.getPermission(permission);
+		List<Permission> olist = new ArrayList<>();
+		Map<Integer, List<Permission>> map = new HashMap<>();
+		// 找出所有父
+		for (Permission o : permisions) {
+			if (o.getPid() != null && o.getPid()!=0) {
+				List<Permission> organList = map.get(o.getPid());
+				if (organList == null) {
+					organList = new ArrayList<>();
+				}
+				organList.add(o);
+				map.put(o.getPid(), organList);
+			}
+		}
+		// 找出子
+		for (Integer oid : map.keySet()) {
+			for (Permission m2 : permisions) {
+				if (m2.getId() == oid) {
+					m2.setChilds(map.get(oid));
+					if (m2.getPid() == null || m2.getPid()==0) {
+						olist.add(m2);
+					}
+				}
+			}
+		}
+
+		return olist;
 	}
 
 	@Override