ss

VisualInspection/js/config.js

@@ -2,5 +2,5 @@
 // var base_server_url = "http://10.112.0.236:8089/";
 var base_image_server_url = "http://10.112.0.236:8088/";
 
-var base_ui_url = "http://192.168.68.126:8080/";
-var base_server_url = "http://192.168.68.126:8089/";
+var base_ui_url = "http://localhost:8080/";
+var base_server_url = "http://localhost:8089/";

VisualInspection/js/main.js

@@ -2,8 +2,6 @@ var MENU;
 //计算左面的
 $(document).ready(function () {
 
-    console.log($.zui.store.enable)
-
     setletftime();
 
     $('#treeMenu').on('click', 'a', function () {

VisualInspection/js/menu/menu.js

@@ -94,7 +94,7 @@ function getMenu() {
          }
      };
 
-     get_common_service('menu/get/all',null,function(data) {
+     get_common_service('menu/get/all?judge=10',null,function(data) {
          zdata = [];
          for (var i = 0; i < data.length; i++) {
              var m = data[i];

VisualInspection/js/role/addpermision.js

@@ -0,0 +1,158 @@
+var permission_selectinput;
+var resource_selectinput;
+var permisiontemp;
+function loadPermisionData(nodedata) {
+    var pnode = nodedata;
+    resetform()
+
+    if (edittype == "add") {
+        $("#dept_name").val("")
+    }
+    if (edittype == "edit") {
+        permisiontemp = PermisionMap.get(nodedata[0].id);
+        setPermison();
+    }
+
+    permission_selectinput = new TreeSelect({
+        element: '#permision_select',
+        data: zdata,
+        valueKey: "id",
+        placeholder: "选择父权限",
+        selectvalue: pnode.length > 0 ? pnode[0].id : null
+    });
+
+
+
+    //获取菜单data
+    getmumdata();
+
+    $("#resourcetype").change(function () {
+
+        if (this.value == "1") {
+            //菜单
+            getmumdata();
+        }
+        if (this.value == "2") {
+            //按钮
+            getbuttonData()
+        }
+
+    });
+
+
+
+    $("#permision_add_btn").on("click", function () {
+        addpermision();
+    })
+
+}
+
+function setPermison(){
+
+    $("#permission_name").val(permisiontemp.name);
+    $("#permission_des").val(permisiontemp.description);
+    $("#resourcetype").val(permisiontemp.type);
+}
+
+
+function addpermision(){
+
+    var per_name = $("#permission_name").val();
+    var per_des = $("#permission_des").val();
+
+    var per_pid = permission_selectinput.value;
+    var resource_type = $("#resourcetype").val();
+    var resource_id = resource_selectinput.value;
+    var data = {
+        "name":per_name,
+        "description":per_des,
+        "type":resource_type,
+        "pid":per_pid,
+        "resourceid":resource_id,
+        "status":1
+    }
+
+     PermisionAdd(data,function(sus_data){
+        layer.msg('添加成功！', {
+            time: 2000, //20s后自动关闭
+        }, function () {
+            $('#addModal').modal('hide')
+           getPermission();
+        });
+     },function(error){
+
+     });
+
+    
+
+}
+
+
+function getbuttonData() {
+    resource_selectinput = new TreeSelect({
+        element: '#resource_select',
+        data: [],
+        valueKey: "id",
+        placeholder: "选择资源",
+        selectvalue: null
+    });
+}
+
+function getmumdata() {
+    var mumdata = [];
+
+    get_common_service('menu/get/all?judge=10', null, function (data) {
+        mumdata = [];
+        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.menuname;
+            zdataItem["children"] = addobj(m);
+            mumdata.push(zdataItem);
+        }
+        resource_selectinput = new TreeSelect({
+            element: '#resource_select',
+            data: mumdata,
+            valueKey: "id",
+            placeholder: "选择资源",
+            selectvalue: permisiontemp==null?null:permisiontemp.resourceid
+        });
+
+    }, function (error) {
+
+    });
+
+
+    function addobj(data) {
+        var zdata = [];
+        if (typeof (data.childs) != "undefinde" && 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["name"] = m.menuname;
+                zdataItem["children"] = addobj(m);
+                zdata.push(zdataItem);
+            }
+            return zdata;
+        } else {
+            return [];
+        }
+    }
+
+}
+
+
+function resetform() {
+
+    $("#permission_name").val("");
+    $("#permission_des").val("");
+      $("#resourcetype").val(1);
+}

VisualInspection/js/role/permision.js

@@ -1,4 +1,6 @@
 var RoleMap = new HashMap()
+var PermisionMap = new HashMap()
+var zdata=[];
 var cols = [{
      width: 10,
      text: '序号',
@@ -26,30 +28,18 @@ var cols = [{
      colClass: 'text-center'
  }];
 $(document).ready(function () {
-
-    $("#main_content_title").html("权限管理")
-
-
-
-    
+     $("#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"
-         //loadData(nodedata)
+         loadPermisionData(nodedata)
          $('#addModal').modal('show')
      })
-
      $("#permision_edit").on("click", function() {
          //获取选中的节点
          var nodedata = dept_tree.getSelectedNodes();
@@ -60,10 +50,9 @@ $(document).ready(function () {
              return;
          }
          edittype = "edit"
-         loadData(nodedata)
+         loadPermisionData(nodedata)
          $('#addModal').modal('show');
      });
-
      $("#permision_delete").on("click", function() {
          //获取选中的节点
          var nodedata = dept_tree.getSelectedNodes();
@@ -82,10 +71,6 @@ $(document).ready(function () {
 
          });
      });
-
-
-
-
      $('.datatable').datatable({
          checkable: false,
          sortable: false,
@@ -168,6 +153,8 @@ function getPermission() {
              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) {
@@ -192,6 +179,8 @@ function getPermission() {
              zdataItem["name"] = m.name;
              zdataItem["children"] = addobj(m);
              zdata.push(zdataItem);
+
+             PermisionMap.set(m.id,m);
          }
          return zdata;
      } else {

VisualInspection/js/util/service.js

@@ -119,7 +119,7 @@ function PermisionGetAll(success, fail) {
 
 
 function PermisionAdd(data,success, fail) {
-    var url = base_server_url + PermisionAdd
+    var url = base_server_url + PERMISION_ADD
     ajaxPost(url, data, function(response) {
         var data = response;
         if (data.result_code == 0) {
@@ -146,8 +146,8 @@ function PermisionEdit(data,success, fail) {
     });
 }
 
-function PermisionDelete(success, fail) {
-    var url = base_server_url + PermisionDelete
+function PermisionDelete(id,success, fail) {
+    var url = base_server_url + PERMISION_DELETE+id;
     ajaxDelete(url, "", function(response) {
         var data = response;
         if (data.result_code == 0) {

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 = 120+'|'+startTime+'|'+endTime;
+        var str = 929+'|'+startTime+'|'+endTime;
         callFunc("findvideolist",str);
     }else{
 

VisualInspection/view/role/addpermision.html

@@ -24,18 +24,18 @@
             </div>
         </div>
 
-          <div class="form-group">
+        <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 id="permision_select">父权限</div>
             </div>
         </div>
-           <div class="form-group">
+        <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>
+                <select class="form-control" id="resourcetype">
                     <option value="1">菜单</option>
+                    <option value="2">按钮</option>
                  </select>
             </div>
         </div>
@@ -52,7 +52,7 @@
 
         <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>
+                <button type="button" id="permision_add_btn" class="btn btn-default" >添加</button>
             </div>
         </div>
     </form>

VisualInspection/view/role/permision.html

@@ -1,6 +1,11 @@
 <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/lib/combotree/icontains.js?__inline"></script>
+<script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js?__inline"></script>
+
 <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">

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
@@ -99,10 +100,10 @@ public class MenuController extends BaseController {
      */
 
     @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllMenu(HttpServletRequest request){
+    public String getAllMenu(HttpServletRequest request,@RequestParam(required=false) Integer judge){
         try{
         	User u = getCurrentUser(request);
-        	List<Menu> menus= menuService.getMenus(new Menu(),u);
+        	List<Menu> menus= menuService.getMenus(new Menu(),u,judge);
         	return returnResult(0, "获取成功", menus);
         }catch(Exception e){
         	throw new BusinessException(20001);
@@ -130,7 +131,7 @@ public class MenuController extends BaseController {
         	Menu menu = new Menu();
         	menu.setId(menuid);
         	
-        	List<Menu> menus = menuService.getMenus(menu,u);
+        	List<Menu> menus = menuService.getMenus(menu,u,0);
         	if(menus==null||menus.size()<1 ) throw  new BusinessException(20001);
         	return returnResult(0, "获取成功", menus.get(0));
         }catch(Exception e){

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

@@ -37,9 +37,9 @@
      <insert id="insert" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" >
         INSERT INTO
         sys_permission
-        (name,descritpion,pid,type,resourceid,status)
+        (name,description,pid,type,resourceid,status)
         VALUES
-        (#{name},#{descritpion},#{pid},#{type},#{resourceid},#{status})
+        (#{name},#{description},#{pid},#{type},#{resourceid},#{status})
     </insert>
     
     
@@ -58,8 +58,7 @@
     </update>
     
      <delete id="delete" parameterType="java.lang.Integer" >
-        update sys_permission
-         set status=-1
+        delete from sys_permission
         WHERE
         id =#{id}
     </delete>

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

@@ -10,7 +10,7 @@ import com.xintong.visualinspection.bean.User;
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface MenuService {
-    public List<Menu> getMenus(Menu menu,User user);
+    public List<Menu> getMenus(Menu menu,User user,Integer judge);
     public List<Menu> getMenuByParent(Menu menu);
     public void insert(Menu menu);
     public void update(Menu menu);

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

@@ -35,10 +35,13 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 	private PermissionDao permissionDao;
 
 	@Override
-	public List<Menu> getMenus(Menu menu,User user) {
+	public List<Menu> getMenus(Menu menu,User user,Integer judge) {
 		
 		List<Menu> menus = 	menuDao.getMenu(menu);
-		menus=getMenusByPermison(menus,user);
+		if(judge==null || judge.intValue()==0){
+			menus=getMenusByPermison(menus,user);
+		}
+		
 		
 		List<Menu> mlist = 	new ArrayList<>();
 		
@@ -61,7 +64,7 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 		//找出子
 		for (Integer mid : map.keySet()) {
 			for (Menu m2 : menus) {
-				if(m2.getId()==mid){
+				if(m2.getId().intValue()==mid.intValue()){
 					m2.setChilds(map.get(mid));
 					if(m2.getParentId()==null){
 						mlist.add(m2);

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