Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/assess_management/assess_way_edit.js

@@ -4,6 +4,9 @@
  var all_data = [] ;
  var check_rule_id ;
  var check_item_tree = null;
+
+var check_rule_tree = null ;
+
  var edittype = "add";
  var cols = [{
      width: 10,
@@ -39,7 +42,7 @@
      var zTreeObj;
      var zNodes = [];
      check_item_tree = $.fn.zTree.init($("#department_tree"), {}, zNodes);
-
+     check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), {}, zNodes);
      getCheckItems();
 
      $("#dept_add").on("click", function() {
@@ -311,6 +314,7 @@ function delete_check_item(id ){
              zdataItem.open = true ;
              all_data.push(zdataItem);
          }
+          check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), setting2, all_data)
      },function(error){})
 
  }
@@ -374,14 +378,18 @@ function loadData(nodedata) {
 
 
 function addCheckItem() {
-    //获取名称
-    var data = {
-        "rule_id": check_rule_id,
-        "id":dept_selectinput.value
+    //获取名称 所有已经勾选的
+    var nodedata = check_rule_tree.getCheckedNodes();
+    var datas = [] ;
+    for(var i=0;i< nodedata.length; i++ ){
+        if(nodedata[i].children.length >0 ){
+            continue;
+        }
+        datas.push({ "rule_id":check_rule_id,"id":nodedata[i].id });
     }
 
     if (edittype == "add") {
-        post_common_service( "checkRuleItem/add",data,function(data){
+        post_common_service( "checkRuleItem/add/list",datas,function(data){
             layer.msg('添加成功！', {
                 time: 2000, //20s后自动关闭
             }, function() {
@@ -402,4 +410,41 @@ function isSelfOrChild(id, node) {
         }
     }
     return false;
-}
+}
+
+
+var setting2 = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: true, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+           
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };

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/teamClass/charge_team_schedule.js

@@ -101,10 +101,10 @@
                     //     $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
                     // }
                     for(var i=0;i<entrance_number;i++){
-                        $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
+                        $(".thread_charge").append("<th>入口"+(i+1)+"</th>");
                     }
                     for(var i=0;i<exit_number;i++){
-                         $(".thread_charge").append("<th>出口车道"+(i+1)+"</th>");
+                         $(".thread_charge").append("<th>出口"+(i+1)+"</th>");
                     }
                 }
             },function(error){
@@ -262,7 +262,7 @@
                              $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
                             var selectv = "<select class='form-control'>"
                                     // console.log(data[i]);
-                            selectv += ("<option value=''>请选择人员</option>");
+                            selectv += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
@@ -285,7 +285,7 @@
                             $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
                               $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
-                            selectv2 += ("<option value=''>请选择人员</option>");
+                            selectv2 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv2 += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>")
@@ -307,7 +307,7 @@
                              $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
                              $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
-                            selectv3 += ("<option value=''>请选择人员</option>");
+                            selectv3 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv3 += "<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>"

VisualInspection/js/user/addUser.js

@@ -73,6 +73,10 @@ function initUserInfo() {
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
+    
+    $("#user_img_pre2").html("")
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
     if (typeof (usertemp.pic) != "undefinde" && usertemp.pic != null) {
         $("#user_img_pre").removeClass("hide");
         $("#user_img_add").addClass("hide");

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/js/util/video.js

@@ -22,7 +22,7 @@ function queryVideoList(){
         s1 = $.checkTask.end_time.replace(/-/g,"/");
         var endTime = new Date(s1).getTime()/1000;
         // alert(curVideo);
-        var str = curVideo+'|'+startTime+'|'+endTime;
+        var str = 120+'|'+startTime+'|'+endTime;
         callFunc("findvideolist",str);
     }else{
 
@@ -43,7 +43,9 @@ function setProcessValue(maxValue){
 function setCurrentProcessValue(value){
     // alert("ddd"+value);
     // console.log(value);
-    $("#ex1").slider('setValue',value);
+    
+    var vv =maxVV*(value/100)
+    $("#ex1").slider('setValue',parseInt(vv));
 }
 
 function setVideoProcess(value){

VisualInspection/view/assess_management/assess_way_edit.html

@@ -54,28 +54,23 @@
             <div class="modal-body">
                 <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="check_item_name" class="form-control" placeholder="名称">
-                            </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="check_item_score" class="form-control" placeholder="分数">
-                            </div>
-                        </div>-->
-                        <div class="form-group check_item_group">
+                        
+                        <!--<div class="form-group check_item_group">
                             <label for="exampleInputPassword4" class="col-sm-3">考核项名称：</label>
                             <div class="col-md-6 col-sm-9">
                                 <div id="check_item_select"></div>
+                            </div>
+                        </div>-->
 
+                        <div class="form-group check_item_group" >
+                            <div class="col-sm-offset-1 col-md-11 col-sm-11" style="height:320px;overflow:auto;" >
+                                <ul id="check_rule_tree" class="ztree">
+                                </ul>
                             </div>
                         </div>
 
                         <div class="form-group">
-                            <div class="col-sm-offset-3 col-sm-10">
+                            <div class="col-sm-offset-2 col-sm-10">
                                 <button type="button" id="add_btn" class="btn btn-default" onclick="addCheckItem()">添加</button>
                             </div>
                         </div>

VisualInspection/view/role/addpermision.html

@@ -0,0 +1,59 @@
+<!--<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="permission_name" class="form-control" id="code_flag" placeholder="名称">
+            </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_des" 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="permission_select">父权限</div>
+            </div>
+        </div>
+           <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">资源类型：</label>
+            <div class="col-md-6 col-sm-10">
+                 <select class="form-control" id="resourcetype">
+                    <option value="2">按钮</option>
+                    <option value="1">菜单</option>
+                 </select>
+            </div>
+        </div>
+
+
+
+
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">资源：</label>
+            <div class="col-md-6 col-sm-10">
+                <div id="resource_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/view/term_management/charge_stuff_schedule.html

@@ -70,7 +70,7 @@
 
 
 <div class="modal fade" id="add_fee_station">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-lg" style="width:1000px;" >
         <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>
@@ -127,6 +127,9 @@
     div.day{
         text-align: center ;
     }
+    .content .events div:first-child{
+        background-color:chocolate !important ;
+    }
 </style>
 <script>
     $(document).ready(function() {

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/CheckRuleItemController.java

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,21 @@ public class CheckRuleItemController extends BaseController {
     }
     
     /**
+     * 增加考核项列表
+     * @param checkItem
+     * @return
+     */
+    @RequestMapping(value = "/add/list")
+    public String add(@Valid @RequestBody List<CheckItem> checkItems){
+    	if(checkItems ==null && checkItems.size()==0){
+    		throw new BusinessException(20002);
+    	}
+    	String returnMsg = checkRuleItemService.insertList(checkItems);
+    	return super.returnSuccessResult(returnMsg==null?"增加成功":returnMsg);
+    }
+    
+    
+    /**
      * 删除考核项
      * @return
      * String

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/dao/master/TeamClassDao.java

@@ -21,5 +21,7 @@ public interface TeamClassDao  {
     public void deleteByDeptWorkdate(TeamClass teamClass);
     
     public List<TeamClass> getClassCode(ClassCode teamClass);
+    
+    public List<TeamClass> getClassListForCharge(TeamClass teamClass);
    
 }

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/mapper/master/TeamClassMapper.xml

@@ -24,6 +24,16 @@
         WHERE id = #{id}
     </select>
     
+    <select id="getClassListForCharge" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
+        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,st.user_ids ,st.name as team_name,st.type
+        FROM sys_team_class t left join sys_team st ON t.team_id = st.id
+        WHERE 1=1
+        <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>
+        <if test="start_time != null">AND t.work_date &gt;= #{start_time}</if>
+        <if test="end_time != null">AND t.work_date &lt;= #{end_time}</if>
+        ORDER BY t.work_date ASC ,t.class_type ASC) tc WHERE tc.type =#{type}
+    </select>
+    
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
         SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,t.user_ids ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id

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

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.service;
 
+import java.util.List;
+
 import com.xintong.visualinspection.bean.CheckItem;
 
 /**
@@ -17,4 +19,5 @@ import com.xintong.visualinspection.bean.CheckItem;
 public interface CheckRuleItemService {
     public String insert(CheckItem checkItem);
     public void delete(CheckItem checkItem);
+    public String insertList(List<CheckItem> checkItems);
 }

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/CheckRuleItemServiceImpl.java

@@ -1,8 +1,11 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.List;
+
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.xintong.visualinspection.bean.CheckItem;
 import com.xintong.visualinspection.bean.CheckRule;
@@ -42,5 +45,14 @@ public class CheckRuleItemServiceImpl extends BaseService implements CheckRuleIt
 		checkRuleItemDao.insert(checkItem);
 		return null ;
 	}
+
+
+	@Override
+	public String insertList(List<CheckItem> checkItems) {
+		for(CheckItem obj : checkItems){
+			String error = insert(obj) ;
+		}
+		return null;
+	}
   
 }

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/java/com/xintong/visualinspection/service/impl/TeamClassServiceImpl.java

@@ -51,20 +51,23 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 
 	@Override
 	public List<TeamClass> getClassListAndUsers(TeamClass teamClass) {
-		List<TeamClass> lists = teamClassDao.getClassList(teamClass);
+		
+		List<TeamClass> lists = teamClassDao.getClassListForCharge(teamClass);
 		for(TeamClass obj : lists){
-			String[] user_ids = obj.getUser_ids().split(",");
-			List<User> userList = new ArrayList<>();
-			for(int i=0;i<user_ids.length;i++){
-				User u = CacheUtil.userMap.get(Integer.valueOf(user_ids[i]) +0L); 
-				if( u != null){
-					User user =new User();
-					user.setId(u.getId());
-					user.setTruename(u.getTruename());
-					userList.add(user);
+			if(obj.getUser_ids()!=null){				
+				String[] user_ids = obj.getUser_ids().split(",");
+				List<User> userList = new ArrayList<>();
+				for(int i=0;i<user_ids.length;i++){
+					User u = CacheUtil.userMap.get(Integer.valueOf(user_ids[i]) +0L); 
+					if( u != null){
+						User user =new User();
+						user.setId(u.getId());
+						user.setTruename(u.getTruename());
+						userList.add(user);
+					}
 				}
+				obj.setUsers(userList);
 			}
-			obj.setUsers(userList);
 		}
 		return lists;
 	}

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