修改同步

src/main/java/im/dx/common/config/RedisConfig.java

@@ -51,7 +51,7 @@ public class RedisConfig {
     @Value("${spring.redis.port}")
     private Integer redisPort;
 
-//
+
 //    @Value("${spring.redis.password}")
 //    private String redisPwd;
 
@@ -158,6 +158,4 @@ public class RedisConfig {
         sessionManager.setSessionIdUrlRewritingEnabled(false);
         return sessionManager;
     }
-
-
 }
\ No newline at end of file

src/main/java/im/dx/common/config/RestTemplateConfig.java

@@ -18,7 +18,7 @@ public class RestTemplateConfig {
     public ClientHttpRequestFactory simpleClientHttpRequestFactory(){
         SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
         factory.setConnectTimeout(15000);
-        factory.setReadTimeout(5000);
+        factory.setReadTimeout(10000);
         return factory;
     }
 

src/main/java/im/dx/common/exception/WebExceptionHandler.java

@@ -28,7 +28,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
-//@ControllerAdvice
+@ControllerAdvice
 public class WebExceptionHandler {
 
     @Resource
@@ -155,11 +155,11 @@ public class WebExceptionHandler {
      * @return SpringBoot 默认提供的 /error Controller 处理器
      */
     private String generateErrorInfo(int code, String msg, int httpStatus) {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        request.setAttribute("code", code);
-        request.setAttribute("msg", msg);
-        request.setAttribute("javax.servlet.error.status_code", httpStatus);
-        return "forward:/error";
+//        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+//        request.setAttribute("code", code);
+//        request.setAttribute("msg", msg);
+//        request.setAttribute("javax.servlet.error.status_code", httpStatus);
+        return msg;
     }
 
 

src/main/java/im/dx/common/util/DateUtils.java

@@ -74,7 +74,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      */
     public static String datePath() {
         Date now = new Date();
-        return DateFormatUtils.format(now, "yyyy/MM/dd");
+        return DateFormatUtils.format(now, "yyyyMM/dd");
     }
 
     /**
@@ -262,4 +262,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 && (c1.get(Calendar.MONTH) == c2.get(Calendar.MONTH))
                 && (c1.get(Calendar.DAY_OF_MONTH) == c2.get(Calendar.DAY_OF_MONTH));
     }
+    public static Date addMinutes(Date date, int minutes) {
+        Calendar cl=Calendar.getInstance();
+        cl.setTime(date);
+        cl.add(Calendar.MINUTE,minutes);
+        return  cl.getTime();
+    }
+    public  static String getTimeStamps(){
+        return  String.valueOf(new Date().getTime());
+    }
 }
\ No newline at end of file

src/main/java/im/dx/system/controller/CodeController.java

@@ -6,9 +6,8 @@ import im.dx.common.util.ResultBean;
 import im.dx.system.model.Code;
 import im.dx.system.model.VideoeRecordType;
 import im.dx.system.service.CodeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import java.util.List;
 
 @RestController
@@ -16,7 +15,7 @@ import java.util.List;
 public class CodeController {
 
 
-    @Resource
+    @Autowired
     private CodeService codeService;
 
     /***
@@ -41,7 +40,7 @@ public class CodeController {
      */
     @GetMapping("/list/{typeid}")
     @ResponseBody
-    public ResultBean getList(@PathVariable("typeid") String typeid) {
+    public ResultBean getCodeByTypeid(@PathVariable("typeid") String typeid) {
         List<Code> codes = codeService.selectAllWithType(typeid);
         return ResultBean.success(codes);
     }
@@ -129,7 +128,7 @@ public class CodeController {
     }
 
     @GetMapping("/update/{name}/{alarmlevel}")
-    public ResultBean update(@PathVariable("name") String name, @PathVariable("alarmlevel") String alarmlevel) {
+    public ResultBean updateAlarmlevel(@PathVariable("name") String name, @PathVariable("alarmlevel") String alarmlevel) {
       //更新手动状态
        return ResultBean.success(codeService.updatemanualcode(name,alarmlevel));
     }

src/main/java/im/dx/system/controller/CommonPageController.java

@@ -2,6 +2,7 @@ package im.dx.system.controller;
 
 import im.dx.common.util.ResultBean;
 import im.dx.system.model.vo.UrlVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -11,7 +12,6 @@ import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import javax.annotation.Resource;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -19,7 +19,7 @@ import java.util.Set;
 @Controller
 public class CommonPageController {
 
-    @Resource
+    @Autowired
     private WebApplicationContext applicationContext;
 
     @GetMapping("/403")

src/main/java/im/dx/system/controller/DeptController.java

@@ -2,15 +2,13 @@ package im.dx.system.controller;
 
 import im.dx.common.shiro.ShiroActionProperties;
 import im.dx.common.util.ResultBean;
-import im.dx.common.util.TreeUtil;
 import im.dx.system.model.Dept;
 import im.dx.system.model.DeptVideo;
 import im.dx.system.service.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -20,10 +18,10 @@ import java.util.Map;
 @RequestMapping("/dept")
 public class DeptController {
 
-    @Resource
+    @Autowired
     private DeptService deptService;
 
-    @Resource
+    @Autowired
     private ShiroActionProperties shiroActionProperties;
 
     @Value("${managername}")
@@ -78,7 +76,7 @@ public class DeptController {
      */
     @ResponseBody
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public ResultBean add(Dept dept) {
+    public ResultBean addinfo(Dept dept) {
         if(null==dept.getDeptId() ||dept.getDeptId().equals(""))
         {
             dept.setDeptId(deptService.selectMaxOrderNum()+1);
@@ -114,7 +112,7 @@ public class DeptController {
     }
 
     @GetMapping("/{deptId}")
-    public ResultBean update(@PathVariable("deptId") String deptId) {
+    public ResultBean getDeptById(@PathVariable("deptId") String deptId) {
         List<Map> dept = deptService.selectByPrimaryKey(deptId);
         return ResultBean.success(dept);
     }
@@ -128,19 +126,6 @@ public class DeptController {
         return ResultBean.success(dept);
     }
 
-    /***
-     * 调整部门排序
-     * @param currentId
-     * @param swapId
-     * @return
-     */
-
-    @PostMapping("/swap")
-    @ResponseBody
-    public ResultBean swapSort(Integer currentId, Integer swapId) {
-        deptService.swapSort(currentId, swapId);
-        return ResultBean.success();
-    }
 
     /***
      * 查询部门及監控
@@ -161,74 +146,6 @@ public class DeptController {
        return ResultBean.success(deptlist);
     }
 
-    /***
-     * 查询部门及監控
-     * @param deptId
-     * @param username
-     * @param tdmc
-     * @return
-     */
-    @GetMapping("/listvideotree")
-    @ResponseBody
-    public ResultBean listvideotree( @RequestParam("deptId") String  deptId,@RequestParam("username") String username,@RequestParam("tdmc")String tdmc) {
-        if (null!=username && (shiroActionProperties.getSuperAdminUsername().equals(username)
-                ||username.equalsIgnoreCase(managername))) {
-            deptId = "0";
-            username=null;
-        }
-        List<DeptVideo> deptlist=deptService.listvideo(deptId, username,tdmc);
-        List<DeptVideo> list= TreeUtil.toTree(deptlist,"deptId","parentId","nodes",DeptVideo.class,deptId);
-        return ResultBean.success(list);
-    }
-
-    /***
-     * 查询部门及其子节点
-     * @param deptId
-     * @param username
-     * @return
-     */
-    @GetMapping("/listChildDept")
-    @ResponseBody
-    public ResultBean listChildDept( @RequestParam("deptId") Integer  deptId,@RequestParam("username") String username) {
-        if (null!=username && (shiroActionProperties.getSuperAdminUsername().equals(username)
-        ||username.equalsIgnoreCase(managername))) {
-            deptId =0;
-            username=null;
-        }
-        List<Dept> deptlist=deptService.selectDeptChildren(deptId, username);
-      return ResultBean.success(deptlist);
-    }
-
-    /***
-     * 更新部门默认监控
-     * @param deptId
-     * @param videoId
-     * @return
-     */
-    @PostMapping("/updateDefaultVideo")
-    @ResponseBody
-    public ResultBean updateDefaultVideo( @RequestParam("deptId") String  deptId,@RequestParam("videoId") String videoId) {
-        int result=deptService.updateDefaultVideoByDeptId(deptId, videoId);
-        if(result>0) {
-            return ResultBean.success();
-        }else {
-            return ResultBean.error("更新失敗");
-        }
-    }
-
-    /***
-     * 查询所有部门默认监控
-     * @param deptId
-     * @return
-     */
-
-    @GetMapping("/queryAllDefaultVideo")
-    @ResponseBody
-    public ResultBean queryAllDefaultVideo( @RequestParam("deptId") String  deptId) {
-        return ResultBean.success(deptService.selectAllDefaultVideo(deptId));
-
-    }
-
 
     /**
      * 查询所有监控

src/main/java/im/dx/system/controller/DeptTreeController.java

@@ -16,8 +16,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -25,10 +23,10 @@ import java.util.Map;
 @RequestMapping("/depttree")
 public class DeptTreeController {
 
-    @Resource
+    @Autowired
     private DeptTreeService deptTreeService;
 
-    @Resource
+    @Autowired
     private ShiroActionProperties shiroActionProperties;
     @Value("${file.taskurl}")
     private String taskurl;
@@ -95,18 +93,11 @@ public class DeptTreeController {
         return "dept/dept-add";
     }
 
-//    @OperationLog("新增部门")
-//    @PostMapping
-//    @ResponseBody
-//    public ResultBean add(DeptTree dept) {
-//        if(null==dept.getDeptId() ||dept.getDeptId().equals(""))
-//        {
-//            dept.setDeptId(deptTreeService.selectMaxOrderNum()+1);
-//        }
-//        dept.setCreateTime(sdf.format(new Date()));
-//        dept.setModifyTime(dept.getCreateTime());
-//        return ResultBean.success(deptTreeService.insert(dept));
-//    }
+     @PostMapping
+    @ResponseBody
+    public ResultBean add(DeptTree dept) {
+     return ResultBean.success(deptTreeService.insert(dept));
+    }
 
     /***
      * 删除部门
@@ -140,34 +131,22 @@ public class DeptTreeController {
         return "dept/dept-add";
     }
 
-    /***
-     * 调整部门排序
-     * @param currentId
-     * @param swapId
-     * @return
-     */
-    @PostMapping("/swap")
-    @ResponseBody
-    public ResultBean swapSort(Integer currentId, Integer swapId) {
-        deptTreeService.swapSort(currentId, swapId);
-        return ResultBean.success();
-    }
-
-    /***
-     * 获取部门列表
-     * @param parentId
-     * @param username
-     * @return
-     */
-    @GetMapping("/listByUsername")
-    @ResponseBody
-    public ResultBean listByUsername(@RequestParam(required = false) String parentId,String username) {
-        if (null!=username && shiroActionProperties.getSuperAdminUsername().equals(username)) {
-            parentId = "0";
-        }
-        List<DeptTree> deptList = deptTreeService.selectAllDeptTree(parentId);
-        return ResultBean.success(deptList);
-    }
+//
+//    /***
+//     * 获取部门列表
+//     * @param parentId
+//     * @param username
+//     * @return
+//     */
+//    @GetMapping("/listByUsername")
+//    @ResponseBody
+//    public ResultBean listByUsername(@RequestParam(required = false) String parentId,String username) {
+//        if (null!=username && shiroActionProperties.getSuperAdminUsername().equals(username)) {
+//            parentId = "0";
+//        }
+//        List<DeptTree> deptList = deptTreeService.selectAllDeptTree(parentId);
+//        return ResultBean.success(deptList);
+//    }
 
     /**
      * 获取角色所管辖事件监控
@@ -183,7 +162,7 @@ public class DeptTreeController {
     }
 
     /***
-     * 获取监控控制的事件
+     * 获取监控所有任务事件
      * @param parentId
      * @param page
      * @param limit

src/main/java/im/dx/system/controller/IndexController.java

@@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -19,24 +17,8 @@ import java.util.regex.Pattern;
 @Slf4j
 public class IndexController {
 
-    @Resource
-    private MenuService menuService;
-
-    @Resource
-    private LoginLogService loginLogService;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private RoleService roleService;
-
-    @Resource
-    private UserOnlineService userOnlineService;
-
     @Autowired
-    private RestTemplate restTemplate;
-
+    private MenuService menuService;
 
     @GetMapping(value = {"/main"})
     public String index(Model model) {
@@ -45,12 +27,12 @@ public class IndexController {
         return "main";
     }
 
-    @GetMapping(value = {"/qxindex"})
-    public String qxindex(Model model) {
-        List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
-        model.addAttribute("menus", menuTreeVOS);
-        return "index";
-    }
+//    @GetMapping(value = {"/qxindex"})
+//    public String qxindex(Model model) {
+//        List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
+//        model.addAttribute("menus", menuTreeVOS);
+//        return "index";
+//    }
 
     @GetMapping(value = {"/pub_index"})
     public String pagepub_index(Model model) {
@@ -116,12 +98,6 @@ public class IndexController {
         return "page/gcjl";
     }
 
-    @GetMapping(value = {"/test"})
-    public String test(Model model) {
-//        List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
-//        model.addAttribute("menus", menuTreeVOS);
-        return "page/test";
-    }
 
     @GetMapping(value = {"/manualscreen"})
     public String manualscreen(Model model) {
@@ -130,19 +106,19 @@ public class IndexController {
         return "page/manualscreen";
     }
     @GetMapping(value = {"/xxtj"})
-    public String xxtj(Model model) {
+    public String pagexxtj(Model model) {
         List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
         model.addAttribute("menus", menuTreeVOS);
         return "page/xxtj";
     }
 
-
-    @GetMapping(value = {"/symrjk"})
-    public String pagesymrjk(Model model) {
-        List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
-        model.addAttribute("menus", menuTreeVOS);
-        return "page/symrjk";
-    }
+//
+//    @GetMapping(value = {"/symrjk"})
+//    public String pagesymrjk(Model model) {
+//        List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
+//        model.addAttribute("menus", menuTreeVOS);
+//        return "page/symrjk";
+//    }
 
     @GetMapping(value = {"/sjdj"})
     public String pagesjdj(Model model) {
@@ -174,7 +150,7 @@ public class IndexController {
     }
 
     @GetMapping(value = {"/jksj"})
-    public String jksj(Model model) {
+    public String pagejksj(Model model) {
         List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
         model.addAttribute("menus", menuTreeVOS);
         return "page/jksj";
@@ -188,7 +164,7 @@ public class IndexController {
     }
 
     @GetMapping(value = {"/rgjy"})
-    public String rgjy(Model model) {
+    public String pagergjy(Model model) {
         List<Menu> menuTreeVOS = menuService.selectCurrentUserMenuTree();
         model.addAttribute("menus", menuTreeVOS);
         return "page/rgjy";
@@ -201,6 +177,10 @@ public class IndexController {
         return "page/rwpfhistory";
     }
 
+    @GetMapping(value = {"/test"})
+    public String test(Model model) {
+        return "page/test";
+    }
 
     public static String getMatcher(String regex, String source) {
         Pattern pattern = Pattern.compile(regex);

src/main/java/im/dx/system/controller/LoginController.java

@@ -3,42 +3,29 @@ package im.dx.system.controller;
 import im.dx.common.shiro.ShiroActionProperties;
 import im.dx.common.util.DateUtils;
 import im.dx.common.util.ResultBean;
-import im.dx.system.model.ResultObj;
 import im.dx.system.model.User;
 import im.dx.system.service.UserService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-import org.thymeleaf.TemplateEngine;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
 @Controller
 public class LoginController {
-
-    @Resource
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+    @Autowired
     private UserService userService;
 
 
-    @Resource
-    private TemplateEngine templateEngine;
-
-    @Resource
-    private ShiroActionProperties shiroActionProperties;
-
-
     @Autowired
-    private RestTemplate restTemplate;
-
+    private ShiroActionProperties shiroActionProperties;
 
     @GetMapping(value = { "/","/login"})
     public String login(Model model) {
@@ -46,17 +33,22 @@ public class LoginController {
         return "login";
     }
 
-    @GetMapping("/register")
-    public String register() {
-        return "register";
-    }
+//    @GetMapping("/register")
+//    public String register() {
+//        return "register";
+//    }
 
     @PostMapping("/login")
     @ResponseBody
     public ResultBean login(User user, @RequestParam(value = "captcha", required = false) String captcha,HttpServletResponse response) {
         Subject subject = SecurityUtils.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword());
+        try {
             subject.login(token);
+        }catch (Exception ex){
+            log.error(ex.toString());
+            return ResultBean.error("用户名或者密码错误");
+        }
         userService.updateLastLoginTimeByUsername(user.getUsername(), DateUtils.dateTimeNow("YYYY/MM/dd HH:mm:ss"));
         //查询用户操作权限一级菜单
         User cuser= userService.selectOneByUserName(user.getUsername());
@@ -99,7 +91,7 @@ public class LoginController {
      */
     @PostMapping("/secondmenu")
     @ResponseBody
-    public ResultBean firstmenu(Integer menuid,String username) {
+    public ResultBean secondmenu(Integer menuid,String username) {
         if (null!=username && shiroActionProperties.getSuperAdminUsername().equals(username)) {
             username = null;
             return ResultBean.success(userService.selectUserSecondMenu(menuid,username));
@@ -112,41 +104,5 @@ public class LoginController {
     }
 
 
-    /**
-     * 事件推送测试模拟接口
-     *
-     * @return 推送结果
-     */
-    @RequestMapping("/test")
-    public ResultObj test() {
-        String message = "{\n" +
-                "    \"type\": \"TRAFFIC_INCIDENT_ALARM\",\n" +
-                "    \"id\": \"d9a2b0f0-f0cf-49b9-9b64-3da86a122afa\",\n" +
-                "    \"video_id\": \"20200305112027144_0\",\n" +
-                "    \"ts\": \"1609310601820\",\n" +
-                "    \"incident_type\": \"no_motor_ban\",\n" +
-                "    \"img_urls\": [\n" +
-                "      \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\",\n" +
-                "      \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\",\n" +
-                "      \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\",\n" +
-                "      \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\",\n" +
-                "      \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\"\n" +
-                "    ],\n" +
-                "    \"video_record_url\": \"http://33.57.1.22:8001/api/alg/files/1605126187-20200619143331241059_0-627?location=\",\n" +
-                "    \"obj_location\": {\n" +
-                "        \"x\": 0.1,\n" +
-                "        \"y\": 0.2,\n" +
-                "        \"width\": 0.4,\n" +
-                "        \"height\": 0.7\n" +
-                "    },\n" +
-                "    \"img_base64\": [\"d0xEMHcFAESwdwaUjWDqB6/1Qw4LapAiSICVTOFWsGT0sgt\"]\n" +
-                "}";
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-        HttpEntity<String> requestEntity = new HttpEntity<>(message, headers);
-        return restTemplate.postForObject("http://localhost:" + 8089 + "/alarmevent", requestEntity, ResultObj.class);
-    }
-
-
 
 }

src/main/java/im/dx/system/controller/LoginLogController.java

@@ -4,20 +4,20 @@ import com.github.pagehelper.PageInfo;
 import im.dx.common.util.PageResultBean;
 import im.dx.system.model.LoginLog;
 import im.dx.system.service.LoginLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @RequestMapping("/log/login")
 public class LoginLogController {
 
-    @Resource
+    @Autowired
     private LoginLogService loginLogService;
 
     @GetMapping("/index")

src/main/java/im/dx/system/controller/MenuController.java

 package im.dx.system.controller;
 
+import com.github.pagehelper.PageInfo;
 import im.dx.common.annotation.RefreshFilterChain;
+import im.dx.common.util.PageResultBean;
 import im.dx.common.util.ResultBean;
 import im.dx.system.model.Menu;
 import im.dx.system.service.MenuService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -17,7 +19,7 @@ import java.util.List;
 @RequestMapping("/menu")
 public class MenuController {
 
-    @Resource
+    @Autowired
     private MenuService menuService;
 
     @GetMapping("/index")
@@ -33,9 +35,12 @@ public class MenuController {
      */
     @GetMapping("/list")
     @ResponseBody
-    public ResultBean getList(@RequestParam(required = false) Integer parentId) {
-        List<Menu> menuList = menuService.selectByParentId(parentId);
-        return ResultBean.success(menuList);
+    public PageResultBean<Menu> getList(@RequestParam(required = false) Integer parentId,
+                              @RequestParam(value = "page", defaultValue = "1") int page,
+                              @RequestParam(value = "limit", defaultValue = "10")int limit) {
+        List<Menu> menuList = menuService.selectByParentId(page,limit,parentId);
+        PageInfo<Menu> userPageInfo = new PageInfo<>(menuList);
+        return new PageResultBean<>(userPageInfo.getTotal(), userPageInfo.getList());
     }
 
     @GetMapping
@@ -110,19 +115,19 @@ public class MenuController {
         menuService.updateByPrimaryKey(menu);
         return ResultBean.success();
     }
-
-    /***
-     * 调整部门排序
-     * @param currentId
-     * @param swapId
-     * @return
-     */
-    @PostMapping("/swap")
-    @ResponseBody
-    public ResultBean swapSort(Integer currentId, Integer swapId) {
-        menuService.swapSort(currentId, swapId);
-        return ResultBean.success();
-    }
+//
+//    /***
+//     * 调整部门排序
+//     * @param currentId
+//     * @param swapId
+//     * @return
+//     */
+//    @PostMapping("/swap")
+//    @ResponseBody
+//    public ResultBean swapSort(Integer currentId, Integer swapId) {
+//        menuService.swapSort(currentId, swapId);
+//        return ResultBean.success();
+//    }
 
 
 

src/main/java/im/dx/system/controller/OperatorController.java

@@ -4,18 +4,18 @@ import im.dx.common.annotation.RefreshFilterChain;
 import im.dx.common.util.ResultBean;
 import im.dx.system.model.Operator;
 import im.dx.system.service.OperatorService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @RequestMapping("/operator")
 public class OperatorController {
 
-    @Resource
+    @Autowired
     private OperatorService operatorService;
 
     /***

src/main/java/im/dx/system/controller/RoleController.java

@@ -6,18 +6,18 @@ import im.dx.common.util.ResultBean;
 import im.dx.system.model.Role;
 import im.dx.system.model.TaskParams;
 import im.dx.system.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @RequestMapping("/role")
 public class RoleController {
 
-    @Resource
+    @Autowired
     private RoleService roleService;
 
     @GetMapping("/index")

src/main/java/im/dx/system/controller/TraffdevicewriteresultController.java

@@ -6,17 +6,10 @@ import im.dx.common.util.ResultBean;
 import im.dx.system.model.*;
 import im.dx.system.service.TraffdevicewriteresultService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 @RestController
 @RequestMapping("/traffresult")

src/main/java/im/dx/system/controller/UserController.java

@@ -11,12 +11,11 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -27,9 +26,9 @@ import java.util.List;
 public class UserController {
 
 
-    @Resource
+    @Autowired
     private UserService userService;
-    @Resource
+    @Autowired
     private RoleService roleService;
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     @GetMapping("/index")
@@ -52,7 +51,7 @@ public class UserController {
     @GetMapping("/list")
     @ResponseBody
     public PageResultBean<User> getList(@RequestParam(value = "page", defaultValue = "1") int page,
-                                        @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+                                        @RequestParam(value = "limit", defaultValue = "10") int pageSize,
                                         User userQuery) {
         List<User> users = userService.selectAllWithDept(page, pageSize, userQuery);
         PageInfo<User> userPageInfo = new PageInfo<>(users);

src/main/java/im/dx/system/controller/UserOnlineController.java

 package im.dx.system.controller;
 
 import im.dx.common.util.PageResultBean;
-import im.dx.common.util.ResultBean;
-import im.dx.common.util.ThreadPoolUtil;
 import im.dx.system.model.UserOnline;
 import im.dx.system.service.UserOnlineService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
 import java.util.List;
-import java.util.concurrent.*;
 
 @Controller
 @RequestMapping("/online")
@@ -23,7 +19,7 @@ public class UserOnlineController {
 
 
 
-    @Resource
+    @Autowired
     private UserOnlineService userOnlineService;
 
 

src/main/java/im/dx/system/controller/VideoController.java

@@ -7,10 +7,7 @@ import im.dx.common.util.JsonUtil;
 import im.dx.common.util.PageResultBean;
 import im.dx.common.util.ResultBean;
 import im.dx.system.model.*;
-import im.dx.system.service.AlgorithmPreprocessService;
-import im.dx.system.service.AutoSnapService;
-import im.dx.system.service.CutpictureService;
-import im.dx.system.service.VideoService;
+import im.dx.system.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +18,6 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -32,32 +27,42 @@ import java.util.concurrent.TimeUnit;
 @RequestMapping("/video")
 public class VideoController {
     private static final Logger log = LoggerFactory.getLogger(VideoController.class);
-    @Resource
+    @Autowired
     private VideoService videoService;
     @Autowired
     public RestTemplate restTemplate;
     @Autowired
     private AutoSnapService autoSnapService;
 
+    @Autowired
+    private VideoRTSPorURLService videoRTSPorURLService;
+
+
+
+    @Value("${local.czurl}")
+    private String czurl;
+
+    @Value("${file.rootpath}")
+    private String czrooturl;
 
     @Value("${file.rtspurl}")
     private String rtspurl;
     @Value("${file.taskurl}")
     private String addtaskurl;
-    @Resource
+    @Autowired
     private ShiroActionProperties shiroActionProperties;
 
 
 
-    @Resource
+    @Autowired
     private CutpictureService cutpictureService;
-    @Resource
+    @Autowired
     AlgorithmPreprocessService  algorithmPreprocessService;
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     /***
-     * 根据deptId获取用户列表
+     * 根据deptId获取设备列表
      * @param page
      * @param pageSize
      * @param deptId
@@ -76,6 +81,7 @@ public class VideoController {
                                          @RequestParam(value = "videoName") String videoName) {
         if (null!=username && shiroActionProperties.getSuperAdminUsername().equals(username)) {
             userId =null;
+            deptId="0";
         }
         List<Video> videos = videoService.selectByMutiParam(page, pageSize, deptId,userId, videoName);
         PageInfo<Video> userPageInfo = new PageInfo<>(videos);
@@ -253,7 +259,7 @@ public class VideoController {
      */
     @PostMapping("/taskmange")
     @ResponseBody
-    public TaskResultObj taskstop(@RequestBody JobLJTParam  jobParam) {
+    public TaskResultObj taskmange(@RequestBody JobLJTParam  jobParam) {
         //调用第三方的停止任务
         try {
             if(jobParam.getStatus()==2 && null!=jobParam.getParams().get("taskId")) {//1:新建，2:暂停，3:重启，4:删除
@@ -416,5 +422,55 @@ public class VideoController {
         return TaskResultObj.ok("");
     }
 
+    @GetMapping("/getsnapPic/{sbbh}")
+    @ResponseBody
+    public TaskResultObj  getsnapPicUrl(@PathVariable(value = "sbbh") String  devicecode) {
+        String rtsporhls = "";
+        //如果设备编号是用一次废一次的，此刻需要现场取得rtsp
+        if (null != devicecode && devicecode.startsWith("33") && devicecode.length() != 18) {
+            //调用抽帧服务
+            String token = videoRTSPorURLService.getRTSPAccessToekenByDeviceCode(devicecode);
+            rtsporhls = videoRTSPorURLService.getRTSPByDeviceCode(token, devicecode);
+        } else {
+            //取表里最新的rtsp 或者hls 的值
+            rtsporhls = videoService.getRtspOrHLSByDeviceCode(devicecode);
+        }
+        if ( rtsporhls.equals("") ) {
+            String token = videoRTSPorURLService.getRTSPAccessToekenByDeviceCode(devicecode);
+            rtsporhls = videoRTSPorURLService.getRTSPByDeviceCode(token, devicecode);
+            if (rtsporhls.equals("")) {
+                log.error(devicecode + "rtsp 、hls 地址为空");
+                return TaskResultObj.error("-1","rtsp 、hls 地址为空");
+            }
+        }
+        //将rtsp 作为参数调用抽帧服务
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        Map map = new HashMap();
+        map.put("resourcePath", czrooturl + "/" + DateUtils.datePath() + "/" + devicecode + "/" + devicecode + "show.jpg");
+        map.put("deviceID", devicecode);
+        map.put("resourceParam", rtsporhls);
+        HttpEntity<Map> requestEntity = new HttpEntity<>(map, headers);
+        log.info("VideoRTSPorURL param:{}", JsonUtil.objToStr(map));
+        try {
+            Map resultmap = restTemplate.postForObject(czurl, requestEntity, Map.class);
+            if (null != resultmap.get("ret") && resultmap.get("ret").toString().equals("0")) {
+                if (null != resultmap.get("resourcePath")
+                        && !resultmap.get("resourcePath").toString().equals("")) {
+                    //抽帧结果放到rabbttmq 中，根据msg 的检测metatype ,分别派发到不同的queue中，方便以后10条10条的去皮皮昂分析
+                    return TaskResultObj.ok(resultmap.get("resourcePath").toString());
+                } else {
+                    log.error("VideoRTSPorURLService error:{}", JsonUtil.objToStr(resultmap));
+                }
+            } else {
+                log.error("VideoRTSPorURLService ->czurl> resultmap is null");
+
+            }
+        }catch (Exception ex){
+            log.error("VideoRTSPorURLService ->czurl>{}",ex.toString());
+        }
+        return TaskResultObj.error("-1","");
+    }
+
 
 }
\ No newline at end of file

src/main/java/im/dx/system/mapper/VideoMapper.java

@@ -19,4 +19,6 @@ public interface VideoMapper {
     int updateImgSrc(String  imgsrc,String sbbh);
     int taskExists(String taskno);
     int taskAutoSnapExists(String taskno);
+    String  getRtspOrHLSByDeviceCode(String devicecode);
+    int updateRTSPorHLSParam(Sbtdspsr video);
 }
\ No newline at end of file

src/main/java/im/dx/system/model/TraffalarmrecordParams.java

@@ -11,12 +11,9 @@ public class TraffalarmrecordParams {
     private String videoids;
     private String deptid;
     private String construction;
-    private String objlabel;
     private String processstatus;
-    private String rectificationtype;
     private  String  userid;
     private String sfpf;
-
     public String getSfpf() {
         return sfpf;
     }
@@ -33,13 +30,6 @@ public class TraffalarmrecordParams {
         this.userid = userid;
     }
 
-    public String getObjlabel() {
-        return objlabel;
-    }
-
-    public void setObjlabel(String objlabel) {
-        this.objlabel = objlabel;
-    }
 
     public String getProcessstatus() {
         return processstatus;
@@ -121,11 +111,4 @@ public class TraffalarmrecordParams {
         this.videoids = videoids;
     }
 
-    public String getRectificationtype() {
-        return rectificationtype;
-    }
-
-    public void setRectificationtype(String rectificationtype) {
-        this.rectificationtype = rectificationtype;
-    }
 }

src/main/java/im/dx/system/model/TraffalarmrecordResult.java

@@ -4,7 +4,7 @@ package im.dx.system.model;
 public class TraffalarmrecordResult extends Traffpicture {
     private String xzmc;
     private String tdmc;
-    private String fileagent;
+    private String imagedata;
     private String recordname;
     private String alarmlevel;
 
@@ -33,13 +33,6 @@ public class TraffalarmrecordResult extends Traffpicture {
         this.tdmc = tdmc;
     }
 
-    public String getFileagent() {
-        return fileagent;
-    }
-
-    public void setFileagent(String fileagent) {
-        this.fileagent = fileagent;
-    }
 
     public String getRecordname() {
         return recordname;
@@ -48,4 +41,12 @@ public class TraffalarmrecordResult extends Traffpicture {
     public void setRecordname(String recordname) {
         this.recordname = recordname;
     }
+
+    public String getImagedata() {
+        return imagedata;
+    }
+
+    public void setImagedata(String imagedata) {
+        this.imagedata = imagedata;
+    }
 }
\ No newline at end of file

src/main/java/im/dx/system/model/Traffpicture.java

@@ -11,7 +11,6 @@ package im.dx.system.model;
  */
 public class Traffpicture {
 
-    private static final long serialVersionUID=1L;
     private  Long  id;
 
     public Long getId() {
@@ -22,38 +21,6 @@ public class Traffpicture {
         this.id = id;
     }
 
-    private String imageid;
-
-    private Integer objectid;
-
-    private  Object  Metadata;
-
-
-    private String Feature;
-
-    private String bucketidlist;
-
-    private String facefeature;
-
-    private String facebucketid;
-
-    private String facebucketidlist;
-
-    private String facequality;
-
-    private String faceyaw;
-
-    private String facepitch;
-
-    private String faceroll;
-
-    private String faceblurry;
-
-    private String objectimagedata;
-
-    private String faceimagedata;
-
-    private String index;
     private String targetnum;
 
     private String createtime;
@@ -93,136 +60,7 @@ public class Traffpicture {
         this.targetnum = targetnum;
     }
 
-    public String getImageid() {
-        return imageid;
-    }
-
-    public void setImageid(String imageid) {
-        this.imageid = imageid;
-    }
-
-
-
-    public Integer getObjectid() {
-        return objectid;
-    }
-
-    public void setObjectid(Integer objectid) {
-        this.objectid = objectid;
-    }
-
-    public Object getMetadata() {
-        return Metadata;
-    }
-
-    public void setMetadata(Object metadata) {
-        Metadata = metadata;
-    }
-
-    public String getFeature() {
-        return Feature;
-    }
-
-    public void setFeature(String feature) {
-        Feature = feature;
-    }
-
-    public String getFacefeature() {
-        return facefeature;
-    }
-
-    public void setFacefeature(String facefeature) {
-        this.facefeature = facefeature;
-    }
-
-    public String getBucketidlist() {
-        return bucketidlist;
-    }
-
-    public void setBucketidlist(String bucketidlist) {
-        this.bucketidlist = bucketidlist;
-    }
 
 
 
-    public String getFacebucketid() {
-        return facebucketid;
-    }
-
-    public void setFacebucketid(String facebucketid) {
-        this.facebucketid = facebucketid;
-    }
-
-    public String getFacebucketidlist() {
-        return facebucketidlist;
-    }
-
-    public void setFacebucketidlist(String facebucketidlist) {
-        this.facebucketidlist = facebucketidlist;
-    }
-
-    public String getFacequality() {
-        return facequality;
-    }
-
-    public void setFacequality(String facequality) {
-        this.facequality = facequality;
-    }
-
-    public String getFaceyaw() {
-        return faceyaw;
-    }
-
-    public void setFaceyaw(String faceyaw) {
-        this.faceyaw = faceyaw;
-    }
-
-    public String getFacepitch() {
-        return facepitch;
-    }
-
-    public void setFacepitch(String facepitch) {
-        this.facepitch = facepitch;
-    }
-
-    public String getFaceroll() {
-        return faceroll;
-    }
-
-    public void setFaceroll(String faceroll) {
-        this.faceroll = faceroll;
-    }
-
-    public String getFaceblurry() {
-        return faceblurry;
-    }
-
-    public void setFaceblurry(String faceblurry) {
-        this.faceblurry = faceblurry;
-    }
-
-    public String getObjectimagedata() {
-        return objectimagedata;
-    }
-
-    public void setObjectimagedata(String objectimagedata) {
-        this.objectimagedata = objectimagedata;
-    }
-
-    public String getFaceimagedata() {
-        return faceimagedata;
-    }
-
-    public void setFaceimagedata(String faceimagedata) {
-        this.faceimagedata = faceimagedata;
-    }
-
-    public String getIndex() {
-        return index;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
 }

src/main/java/im/dx/system/model/TraffpictureParam.java

@@ -17,7 +17,6 @@ public class TraffpictureParam extends Traffpicture {
     private Long id;
     private String fdid;
     private  Integer  channelid;
-    private Long areaid;
     private String recordtype;
     @JsonIgnore
     private Integer retrycount;
@@ -36,8 +35,6 @@ public class TraffpictureParam extends Traffpicture {
     @JsonIgnore
     private Date pushdate;
     private String processstatus;
-    @JsonIgnore
-    private Integer manualstatus;
     private  String  imagedata;
     private Integer  alarmnum;
     private String  taskhandler;
@@ -83,7 +80,6 @@ public class TraffpictureParam extends Traffpicture {
     private Integer objh;
     private String  tdmc;
     private String  xzmc;
-    private  String  metatype;
 
     public String getTdmc() {
         return tdmc;
@@ -265,13 +261,6 @@ public class TraffpictureParam extends Traffpicture {
         this.processstatus = processstatus;
     }
 
-    public Integer getManualstatus() {
-        return manualstatus;
-    }
-
-    public void setManualstatus(Integer manualstatus) {
-        this.manualstatus = manualstatus;
-    }
 
     public Integer getChannelid() {
         return channelid;
@@ -281,13 +270,6 @@ public class TraffpictureParam extends Traffpicture {
         this.channelid = channelid;
     }
 
-    public Long getAreaid() {
-        return areaid;
-    }
-
-    public void setAreaid(Long areaid) {
-        this.areaid = areaid;
-    }
 
     public String getRecordtype() {
         return recordtype;
@@ -297,11 +279,4 @@ public class TraffpictureParam extends Traffpicture {
         this.recordtype = recordtype;
     }
 
-    public String getMetatype() {
-        return metatype;
-    }
-
-    public void setMetatype(String metatype) {
-        this.metatype = metatype;
-    }
 }

src/main/java/im/dx/system/model/User.java

@@ -46,11 +46,8 @@ public class User implements Serializable {
     private String deptName;
 
     private String lxdh;
-
     private String videoId;
 
-    private  String  recordId;
-
     public String getVideoId() {
         return videoId;
     }
@@ -59,14 +56,6 @@ public class User implements Serializable {
         this.videoId = videoId;
     }
 
-    public String getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(String recordId) {
-        this.recordId = recordId;
-    }
-
     public String getLxdh() {
         return lxdh;
     }

src/main/java/im/dx/system/service/DeptTreeService.java

@@ -16,14 +16,9 @@ public class DeptTreeService {
     private DeptTreeMapper deptTreeMapper;
 
     public DeptTree insert(DeptTree dept) {
-        int maxOrderNum = deptTreeMapper.selectMaxOrderNum();
-        dept.setOrderNum(maxOrderNum + 1);
         deptTreeMapper.insert(dept);
         return dept;
     }
-    public int selectMaxOrderNum() {
-        return deptTreeMapper.selectMaxOrderNum();
-    }
 
     public int deleteByPrimaryKey(String deptId) {
         return deptTreeMapper.deleteByPrimaryKey(deptId);
@@ -44,10 +39,10 @@ public class DeptTreeService {
      */
     public void deleteCascadeByID(String deptId) {
 
-        List<String> childIDList = deptTreeMapper.selectChildrenIDByPrimaryKey(deptId);
-        for (String childId : childIDList) {
-            deleteCascadeByID(childId);
-        }
+//        List<String> childIDList = deptTreeMapper.selectChildrenIDByPrimaryKey(deptId);
+//        for (String childId : childIDList) {
+//            deleteCascadeByID(childId);
+//        }
 
         deleteByPrimaryKey(deptId);
     }

src/main/java/im/dx/system/service/MenuService.java

 package im.dx.system.service;
 
+import com.github.pagehelper.PageHelper;
 import im.dx.common.shiro.ShiroActionProperties;
 import im.dx.common.util.ShiroUtil;
 import im.dx.common.util.TreeUtil;
@@ -44,7 +45,8 @@ public class MenuService {
     /**
      * 根据父 ID 获取所有菜单
      */
-    public List<Menu> selectByParentId(Integer parentId) {
+    public List<Menu> selectByParentId(int page,int rows,Integer parentId) {
+        PageHelper.startPage(page, rows);
         return menuMapper.selectByParentId(parentId);
     }
 

src/main/java/im/dx/system/service/VideoService.java

@@ -50,4 +50,11 @@ public class VideoService {
     public  int  taskAutoSnapExists(String taskno){
        return  videoMapper.taskAutoSnapExists(taskno);
     }
+    public  String  getRtspOrHLSByDeviceCode(String devicecode){
+        return  videoMapper.getRtspOrHLSByDeviceCode(devicecode);
+    }
+
+    public int updateRTSPorHLSParam(Sbtdspsr sbtdspsr){
+        return  videoMapper.updateRTSPorHLSParam(sbtdspsr);
+    }
 }
\ No newline at end of file

src/main/resources/application-local.properties

 
 spring.datasource.username=root
 spring.datasource.password=root
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/iamgepro2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.filters= stat
@@ -57,9 +57,7 @@ spring.devtools.restart.exclude=static/**,public/**
 
 
 managername=admin
-
-ipurl=:8001/api/traffic-incident/restartAutoRule
-file.taskurl=http://localhost:8088/ai/task
+#Ͱ
 dixanxinAIurl=http://vca-center-provider/algorithm/router
 dixanxinTokenurl=https://apicapacity.51iwifi.com/oauth/token?grantType=client_credential&appId=%s&appSecret=%s
 appSecret=d4c221294eea3bfd

src/main/resources/application.properties

-spring.profiles.active=devzjgs
+spring.profiles.active=prod
 
-server.port=8083
+server.port=8082
 
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.configuration.default-fetch-size=100
@@ -14,3 +14,10 @@ spring.http.encoding.force=true
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 server.tomcat.uri-encoding=UTF-8
+hlsurl.token=http://183.131.122.215:85/appApi/authenticate/getToken
+hlsurl.url=http://183.131.122.215:85/appApi/forward/byCode/57240035916824
+rtspurl.token=http://kvideo.51iwifi.com/home_gw/getAccessToken
+rtspurl.url= http://kvideo.51iwifi.com/home_gw/heschome_api/api/hesc/open/getRtsp
+rtspurl.appid= 8e9c7ff0fc6c11eac5efb5371726daaf
+rtspurl.appsecret=8e9ca700fc6c11eac5efb5371726daaf
+rtspurl.params=deviceCode
\ No newline at end of file

src/main/resources/logback-spring.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/home/ubuntu/tar/logs/zjgszdVideoAlarmService/${spring.application.name}"/>
+    <property name="log.path" value="/home/prod/tar/log/zjgszdVideoAlarmService/${spring.application.name}"/>
     <!--<property name="log.path" value="/home/prod/deploy/HZDXService/logs/${spring.application.name}"/>-->
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"

src/main/resources/mapper/DeptMapper.xml

@@ -3,10 +3,7 @@
 <mapper namespace="im.dx.system.mapper.DeptMapper">
 
     <resultMap id="BaseResultMap" type="im.dx.system.model.Dept">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+
         <id column="dept_id" jdbcType="INTEGER" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="parent_id" jdbcType="INTEGER" property="parentId"/>
@@ -31,10 +28,6 @@
     </resultMap>
 
     <resultMap id="TreeBaseResultMap" type="im.dx.system.model.Dept">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         <id column="dept_id" jdbcType="INTEGER" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="levels" jdbcType="VARCHAR" property="level"/>
@@ -45,10 +38,6 @@
         <collection property="nodes" ofType="im.dx.system.model.Dept" select="selectAllTree" column="{parent_id = dept_id}"/>
     </resultMap>
     <resultMap id="VideoTreeBaseResultMap" type="im.dx.system.model.DeptVideo">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         <id column="dept_id" jdbcType="VARCHAR" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="levels" jdbcType="VARCHAR" property="level"/>
@@ -64,18 +53,10 @@
 
 
     <sql id="Base_Column_List">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         dept_id  , dept_name, parent_id, order_num, create_time, modify_time,levels
     </sql>
 
     <select id="selectByPrimaryKey" resultType="java.util.HashMap">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         select
         dept_id "deptId" , dept_name "deptName", parent_id "parentId", order_num "orderNum", create_time "createTime", modify_time "modifyTime",levels "level"
         from dept
@@ -84,19 +65,11 @@
 
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         delete from dept
-        where dept_id = #{deptId,jdbcType=INTEGER}
+        where dept_id = #{deptId,jdbcType=INTEGER} or  find_in_set(#{deptId,jdbcType=INTEGER},idsets)
     </delete>
 
     <insert id="insert" parameterType="im.dx.system.model.Dept">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         insert into dept (dept_id,dept_name, parent_id, order_num,
         create_time, modify_time,levels)
         values (#{deptId,jdbcType=VARCHAR},#{deptName,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{orderNum,jdbcType=INTEGER},
@@ -106,10 +79,6 @@
 
 
     <update id="updateByPrimaryKey" parameterType="im.dx.system.model.Dept">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         update dept
         set dept_name = #{deptName,jdbcType=VARCHAR},
         modify_time = #{modifyTime,jdbcType=VARCHAR}
@@ -172,7 +141,6 @@
     </select>
 
     <select id="listvideo" resultMap="VideoTreeBaseResultMap">
-
         select distinct t.dept_id dept_id,
         t.dept_name ,
         parent_id parent_id,

src/main/resources/mapper/DeptTreeMapper.xml

@@ -3,10 +3,7 @@
 <mapper namespace="im.dx.system.mapper.DeptTreeMapper">
 
     <resultMap id="BaseResultMap" type="im.dx.system.model.DeptTree">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+
         <id column="dept_id" jdbcType="INTEGER" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="parent_id" jdbcType="INTEGER" property="parentId"/>
@@ -17,10 +14,7 @@
 
 
     <resultMap id="TreeBaseResultMap" type="im.dx.system.model.DeptTree">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+
         <id column="dept_id" jdbcType="INTEGER" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="levels" jdbcType="VARCHAR" property="level"/>
@@ -33,10 +27,7 @@
     </resultMap>
 
     <resultMap id="TreeBaseVideoResultMap" type="im.dx.system.model.DeptTree">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+
         <id column="dept_id" jdbcType="INTEGER" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="levels" jdbcType="VARCHAR" property="level"/>
@@ -45,51 +36,36 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         dept_id, dept_name, parent_id, order_num, create_time, modify_time,levels
     </sql>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+    <!--<select id="selectByPrimaryKey" parameterType="java.lang.Integer"-->
+            <!--resultType="im.dx.system.model.DeptTree">-->
+           <!--select  concat(dept_id,'') deptId, dept_name deptName ,concat(parent_id,'') parentId, order_num orderNum,levels  level  from dept-->
+        <!--where dept_id = #{deptId}-->
+    <!--</select>-->
+    <select id="selectByPrimaryKey" resultType="im.dx.system.model.DeptTree">
         select
-        <include refid="Base_Column_List"/>
+        dept_id "deptId" , dept_name "deptName", parent_id "parentId", order_num "orderNum", create_time "createTime", modify_time "modifyTime",levels "level"
         from dept
-        where dept_id = #{deptId}
+        where dept_id =#{deptId}
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+    <delete id="deleteByPrimaryKey" >
        delete from dept
-        where dept_id = #{deptId}
+        where dept_id = #{deptId}   or  find_in_set(#{deptId},idsets)
     </delete>
 
-    <insert id="insert" keyColumn="dept_id" keyProperty="deptId" parameterType="im.dx.system.model.DeptTree"
-            useGeneratedKeys="true">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
-        insert into dept (dept_id,dept_name, parent_id, order_num,
-        create_time, modify_time,levels)
-        values (#{deptId,jdbcType=VARCHAR},#{deptName,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
-        #{orderNum,jdbcType=INTEGER},
-        #{createTime,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR})
+    <insert id="insert" keyColumn="dept_id" keyProperty="deptId" parameterType="im.dx.system.model.DeptTree">
+       INSERT INTO dept ( dept_id, dept_name, parent_id, order_num, levels, idsets )
+        SELECT (select   max( dept_id )+ 1 from dept),#{deptName}, #{parentId},(select   max(order_num)+1 from dept),
+        (select levels +1 from dept where   dept_id =#{parentId} ),
+        (SELECT	concat( idsets,",",(select   max( dept_id )+ 1 from dept)) FROM	dept WHERE	dept_id =#{parentId})
+        FROM    DUAL
     </insert>
 
     <update id="updateByPrimaryKey" parameterType="im.dx.system.model.DeptTree">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
+
         update dept
         set dept_name = #{deptName,jdbcType=VARCHAR},
         modify_time = #{modifyTime,jdbcType=VARCHAR}
@@ -110,10 +86,6 @@
         where parent_id = #{deptId}
     </select>
 
-    <select id="selectMaxOrderNum" resultType="int">
-        select IFNULL(max(order_num), 0)
-        from dept
-    </select>
 
     <update id="swapSort">
         UPDATE
@@ -171,7 +143,9 @@
        (select max(levels)+1 from dept ) levels
         from  sbtdspsr a,role_videoerecordtype b,user_role c
         where a.sbbh=b.videorecordtypeid and  b.roleid=c.role_id
+        <if test="username != null and  username!=''">
         and c.user_id=(select user_id from t_user where username=#{username} limit 1)
+        </if>
         )a)a
         ) a,(SELECT @rownum:=0) r
         order by order_num
@@ -180,8 +154,8 @@
 
     <select id="listeventByvideoid" resultType="java.lang.String">
         select videorecordtypeid
-        from role_videoerecordtype a,user_role b
-        where a.roleid =b.role_id and a.roleid = #{userId}
+        from role_videoerecordtype a
+        where  a.roleid = #{userId}
     </select>
 
     <select id="selectVideoeRecordType" resultType="java.util.Map">

src/main/resources/mapper/TrafficStatisticsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="im.dx.system.mapper.TrafficStatisticsMapper">
+<mapper namespace="im.dx.system.mapper.TrafficMapper">
     <resultMap id="AlarmResultMap" type="im.dx.system.model.Alarm">
         <id column="operator_id" jdbcType="INTEGER" property="operatorId"/>
         <result column="id" jdbcType="VARCHAR" property="id"/>
@@ -109,14 +109,16 @@
     <select id="queryTraffalarmrecordByPage" resultType="im.dx.system.model.TraffpictureParam">
         SELECT
         TA.*,
-        TA.createtime recordtime,tdmc,dept_name xzmc, NAME recordname, b.alarmnum,
+        TA.createtime recordtime,tdmc,
+        (select  dept_name from dept  where dept_id=a.xzbh )xzmc
+       , NAME recordname, b.alarmnum,
         c.username taskhandler , state taskstate, handlertime
         FROM
+
+
         traffpicture TA
-        LEFT JOIN sbtdspsr ON sbbh = fdid
-        AND tdbh = channelid
-        LEFT JOIN dept on dept_id = TA.areaid
-        LEFT JOIN t_code b ON TA.recordtype = LOWER( b.KEY ) AND type = 2
+        LEFT JOIN   sbtdspsr a ON sbbh = fdid
+        LEFT JOIN t_code b ON type = 2 AND TA.recordtype = LOWER( b.KEY )
         <if test="sfpf!= null  and sfpf==1">
             INNER JOIN (
             select a.*,b.username from
@@ -171,19 +173,16 @@
                     ( TA.fdid  = #{item} )
                 </foreach>
             </if>
-
         ORDER BY TA.createtime DESC
     </select>
     <select id="queryTaskInfoByPage" resultType="im.dx.system.model.TraffpictureParam">
         SELECT
         TA.*,
-        TA.createtime recordtime,tdmc,dept_name xzmc, NAME	recordname, b.alarmnum,
+        TA.createtime recordtime,tdmc,(select dept_name  from dept where  dept_id=a.xzbh)  xzmc, NAME	recordname, b.alarmnum,
         concat( c.handler, '_', state, '_', handlertime ) remark
         FROM
         traffpicture TA
-        LEFT JOIN sbtdspsr ON sbbh = fdid
-        AND tdbh = channelid
-        LEFT  join dept  on dept_id = TA.areaid
+        LEFT JOIN sbtdspsr a ON sbbh = fdid AND tdbh = channelid
         LEFT JOIN t_code b ON TA.recordtype = LOWER( b.KEY )AND type = 2
         <if test="sfpf!= null  and sfpf==1">
             inner JOIN taskinfo c ON TA.id = traffid and  state!=0  and handler=#{userId}
@@ -324,7 +323,7 @@
         SELECT a.*,b.tdmc tdmc,c.name recordname
         FROM traffpicture a
         INNER JOIN sbtdspsr b on a.fdid=b.sbbh
-        LEFT JOIN t_code c on c.key=upper(recordtype)
+        LEFT JOIN t_code c on c.key=upper(recordtype) and c.type=2
         <where>
             <if test="starttime != '' and starttime != null ">
                 AND a.createtime >= str_to_date( #{starttime}, '%Y-%m-%d %H:%i:%s' )
@@ -356,84 +355,6 @@
         order by createtime desc
     </select>
 
-    <select id="selecteventresultBypage" parameterType="im.dx.system.model.TraffalarmrecordstatParams"
-            resultType="im.dx.system.model.Traffalarmrecordstate">
-        <if test="type!=null and type ==1">
-            WITH A AS (
-            SELECT DATE_FORMAT(STR_TO_DATE(#{starttime},'%Y-%m-%d')+((@rownum := @rownum + 1)-1),'yyyy-mm-dd') COUNTDATE
-            FROM dual ,(SELECT @rownum:=0) r CONNECT BY (@rownum := @rownum + 1) &lt;= STR_TO_DATE(#{endtime},'yyyy-mm-dd') - STR_TO_DATE(#{starttime},'yyyy-mm-dd')+1
-            ),B AS (
-            SELECT COUNTDATE, IFNULL(SUM(TOTALCOUNT),0) TOTALCOUNT,
-            IFNULL(SUM(NOPUSH),0) NOPUSHCOUNT,
-            IFNULL(SUM(FAILPUSH),0) FAILPUSHCOUNT,
-            IFNULL(SUM(SUCCESSPUSH),0)SUCCESSPUSHCOUNT from traffalarmrecordSTAT TA
-            <where>
-                <if test="starttime!=null">
-                    AND TA.COUNTDATE >= #{starttime}
-                </if>
-                <if test="endtime!=null">
-                    AND TA.COUNTDATE &lt;= #{endtime}
-                </if>
-                <if test="areaid!=null and areaid != ''">
-                    AND TA.AREAID in (SELECT dept_id
-                    FROM dept
-                    START WITH dept_id =#{areaid}
-                    CONNECT BY parent_id = PRIOR dept_id)
-                </if>
-                <if test="eventtype!=null and eventtype != ''">
-                    AND TA.EVENTTYPE = #{eventtype}
-                </if>
-            </where>
-            GROUP BY COUNTDATE
-            )
-            SELECT A.*, B.TOTALCOUNT,B.NOPUSHCOUNT,B.FAILPUSHCOUNT,B.SUCCESSPUSHCOUNT,(select dept_name from dept where
-            dept_id=#{areaid} )AREANAME
-            FROM A LEFT JOIN B ON A.COUNTDATE=B.COUNTDATE
-            ORDER BY A.COUNTDATE DESC
-        </if>
-        <if test="type!=null and type ==2">
-            WITH A AS (
-            SELECT DATE_FORMAT(ADD_MONTHS(STR_TO_DATE(SUBSTR(#{starttime}, 1, 7),'%Y-%m'),(@rownum := @rownum + 1)-1),'yyyy-mm') COUNTDATE
-            FROM dual ,(SELECT @rownum:=0) r CONNECT BY (@rownum := @rownum + 1) &lt;= MONTHS_BETWEEN(STR_TO_DATE(SUBSTR(#{endtime}, 1,
-            7),'yyyy-mm'),STR_TO_DATE(SUBSTR(#{starttime}, 1, 7),'yyyy-mm'))+1
-            ) ,B AS (
-            SELECT (SUBSTR(COUNTDATE, 1, 7)) COUNTDATE,
-            IFNULL(SUM(TOTALCOUNT),0) TOTALCOUNT,
-            IFNULL(SUM(NOPUSH),0) NOPUSHCOUNT,
-            IFNULL(SUM(FAILPUSH),0) FAILPUSHCOUNT,
-            IFNULL(SUM(SUCCESSPUSH),0)SUCCESSPUSHCOUNT
-            from traffalarmrecordSTAT TA
-            <where>
-                <if test="starttime!=null">
-                    AND TA.COUNTDATE >= #{starttime} ||'-01'
-                </if>
-                <if test="endtime!=null">
-                    AND TA.COUNTDATE &lt;= #{endtime} || '-31'
-                </if>
-                <if test="areaid!=null and areaid != ''">
-                    AND TA.AREAID in (SELECT dept_id
-                    FROM dept
-                    START WITH dept_id =#{areaid}
-                    CONNECT BY parent_id = PRIOR dept_id)
-                </if>
-                <if test="eventtype!=null and eventtype != ''">
-                    AND TA.EVENTTYPE = #{eventtype}
-                </if>
-            </where>
-            GROUP BY (SUBSTR(COUNTDATE, 1, 7))
-            )
-            SELECT A.*, B.TOTALCOUNT,B.NOPUSHCOUNT,B.FAILPUSHCOUNT,B.SUCCESSPUSHCOUNT,(select dept_name from dept where
-            dept_id=#{areaid} )AREANAME
-            FROM A LEFT JOIN B ON A.COUNTDATE=B.COUNTDATE
-            ORDER BY A.COUNTDATE DESC
-        </if>
-        <if test="type==null or type ==0">
-            SELECT * from traffalarmrecordSTAT
-        </if>
-
-
-    </select>
-
     <delete id="deleteTraffalarmrecordById">
             delete  from  traffalarmrecord where  recordid= #{recordid}
     </delete>

src/main/resources/mapper/VideoMapper.xml

@@ -3,10 +3,6 @@
 <mapper namespace="im.dx.system.mapper.VideoMapper">
 
     <resultMap id="BaseResultMap" type="im.dx.system.model.SbtdspsrResult">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         <result column="xh" jdbcType="VARCHAR" property="xh"/>
         <result column="sbbh" jdbcType="VARCHAR" property="sbbh"/>
         <result column="tdbh" jdbcType="VARCHAR" property="tdbh"/>
@@ -19,10 +15,6 @@
     </resultMap>
 
     <resultMap id="TreeBaseResultMap" type="im.dx.system.model.Menu">
-        <!--
-          WARNING - @mbg.generated
-          This element is automatically generated by MyBatis Generator, do not modify.
-        -->
         <id column="menu_id" jdbcType="INTEGER" property="menuId"/>
         <result column="parent_id" jdbcType="INTEGER" property="parentId"/>
         <result column="menu_name" jdbcType="VARCHAR" property="menuName"/>
@@ -50,14 +42,17 @@
         <if test="videoName != null and  videoName != '' ">
             and tdmc like '%${videoName}%'
         </if>
+        <if test="userId !=null and userId !=''">
         union
         select a.xh,  a.tdmc,  a.sbbh ,a.tdbh,a.squrllj,a.xzbh,a.jd,a.wd ,
         (select  b.dept_name from  dept b where b.dept_id=a.xzbh limit 1)   qymc, a.tdlx,a.kz3
         from sbtdspsr a
-        <if test="userId !=null and userId !=''">
         ,role_videoerecordtype b
         where a.sbbh=b.videorecordtypeid
         and b.roleid=(select  role_id from user_role where user_id=#{userId} limit 1)
+        <if test="videoName != null and  videoName != '' ">
+            and tdmc like '%${videoName}%'
+        </if>
         </if>
         order by sbbh
     </select>
@@ -71,16 +66,35 @@
     </delete>
     <update id="updateByPrimaryKey" parameterType="im.dx.system.model.Sbtdspsr">
         update sbtdspsr
-        set
+        <trim prefix="set" suffixOverrides=",">
+        <if test="sbbh != null and sbbh !=''">
               sbbh  = #{sbbh ,jdbcType=VARCHAR},
+        </if>
+        <if test="tdbh != null and tdbh !=''">
               tdbh  = #{tdbh ,jdbcType=VARCHAR},
+        </if>
+        <if test="tdmc != null and tdmc !=''">
               tdmc  = #{tdmc ,jdbcType=VARCHAR},
+        </if>
+            <if test="xzbh != null and xzbh !=''">
               xzbh  = #{xzbh ,jdbcType=INTEGER},
+            </if>
+            <if test="jd != null and jd !=''">
               jd  = #{jd ,jdbcType=VARCHAR},
+            </if>
+            <if test="wd != null and wd !=''">
               wd  = #{wd ,jdbcType=VARCHAR},
+            </if>
+            <if test="squrllj != null and squrllj !=''">
               squrllj  = #{squrllj ,jdbcType=VARCHAR},
+            </if>
+            <if test="xgry != null and xgry !=''">
               xgry = #{xgry,jdbcType=VARCHAR},
+            </if>
+            <if test="xgrq != null and xgrq !=''">
               xgrq  = #{xgrq ,jdbcType=VARCHAR}
+            </if>
+        </trim>
         where xh = #{xh,jdbcType=VARCHAR}
     </update>
     <select id="taskExists" resultType="java.lang.Integer">
@@ -89,5 +103,28 @@
     <update id="updateImgSrc" >
             update sbtdspsr set  kz3=#{imgsrc} where sbbh=#{sbbh}
     </update>
+    <update id="updateRTSPorHLSParam">
+        update sbtdspsr
+        <trim prefix="set" suffixOverrides=",">
+            <if test="squrllj != null and squrllj !=''">
+                squrllj =#{squrllj},
+            </if>
+            <if test="token != null and token !=''">
+                token =#{token},
+            </if>
+            <if test="tokennexttime != null and tokennexttime !=''">
+                tokennexttime =#{tokennexttime},
+            </if>
 
+            <if test="urlnexttime != null and urlnexttime !=''">
+                urlnexttime =#{urlnexttime},
+            </if>
+
+        </trim>
+        where sbbh=#{sbbh}
+
+    </update>
+    <select id="getRtspOrHLSByDeviceCode" parameterType="java.lang.String" resultType="java.lang.String">
+      select squrllj from sbtdspsr where  sbbh=#{deviceCode}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/static/css/gcjl.css

@@ -237,7 +237,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/css/sbts.css

@@ -236,7 +236,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/css/sjcx - 副本.css

@@ -237,7 +237,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/css/sjcx.css

@@ -158,7 +158,7 @@ html, body {
 
 /**左边行政辖区**/
 .div-left {
-    width: calc(100% - 20px);
+    width: calc(100% - 10px);
     height: calc(100% - 20px);
     margin: 10px;
 }
@@ -237,7 +237,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/css/sjts.css

@@ -236,7 +236,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/css/tstj.css

@@ -237,7 +237,7 @@ html, body {
 }
 
 .div-ul li {
-    width: 400px;
+    width: 396px;
     height: 400px;
     padding: 5px;
     box-shadow: 0px 0px 9px #cecece;

src/main/resources/static/js/jgsbgl/jgsbgl.js

@@ -23,6 +23,7 @@ let vue_right = new Vue({
             }
             },
         add: function (item){
+            vue_default.data_s.xh=null;
             $("#myjgModal1").modal("show");
         },
         edit: function (item) {
@@ -144,16 +145,19 @@ let vue_sjcx = new Vue({
                 //根据当前设备sbbh 调用抽帧服务
                 that=this;
                 $.ajax({
-                        url: "/video/getsnap/"+this.sbbh,
+                        url: "/video/getsnapPic/"+this.sbbh,
                         dataType: "json",
                         type: "GET",
                         contentType: 'application/json',
                         success: function (result) {
                             if(result.errorCode=="0"){
-                               that.imgsrc= result.data;
+                               that.imgsrc="http://zjh189.ncpoi.cc:7180"+ result.data;
                                 document.getElementById('iframe').contentWindow.frames.setImg();
                                 // draw.src=result.data;
                             }
+                            else{
+                                alert("抽帧繁忙，请重试!")
+                            }
 
                         },error:function(result){
                             alert("获得失败!")
@@ -397,7 +401,7 @@ let  vue_default= new Vue({
                     'name':'自动抓拍'
                 }],
                 data_s: {
-                    id: '',
+                    xh: '',
                     sbbh: '',
                     tdbh: '0',
                     tdmc: '',

src/main/resources/static/js/jkgl/jkgl.js

@@ -138,14 +138,6 @@ let vue_tree = new Vue({
             this.xzlm();
         },
         xzlm: function () {
-            $.ajax({
-                url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
-                dataType: "json",
-                type: "GET",
-                data: {},
-                success: function (result) {
-                    if (result.code == 0) {
-                        let parIds = result.data[0].parentId;
             $.ajax({
                 url: "/dept/listvideo",
                 dataType: "json",
@@ -160,7 +152,7 @@ let vue_tree = new Vue({
                     vue_tree.jk_arr = [];
                     if (result.code == 0) {
                         vue_tree.jk_arr = result.data;
-                                    defaultData = toTree(result.data, parIds + '');
+                        defaultData = toTree(result.data,  '0');
                         $('#tree-xzxq').treeview({
                             expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
                             collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
@@ -250,14 +242,23 @@ let vue_tree = new Vue({
                     }
                 }
             });
-                    }
-                }
-            });
+            // $.ajax({
+            //     url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
+            //     dataType: "json",
+            //     type: "GET",
+            //     data: {},
+            //     success: function (result) {
+            //         if (result.code == 0) {
+            //             let parIds = result.data[0].parentId;
+            //
+            //         }
+            //     }
+            // });
         },
     },
     mounted(){
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -960,7 +961,7 @@ let vue_sjsstx = new Vue({
                 processstatus: e
             });
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -1610,7 +1611,7 @@ function websocket_gzdj(video_id, items, indexs_1) {
 function j5fz_jczssj(id) {
 
     $.ajax({
-        url: "/TrafficStatistics/list/vehiclesByVideoIdAndType",
+        url: "/traffic/list/vehiclesByVideoIdAndType",
         dataType: "json",
         type: "get",
         data: {
@@ -1650,7 +1651,7 @@ function j5fz_jczssj(id) {
         }
     });
     $.ajax({
-        url: "/TrafficStatistics/list/vehiclesByVideoIdAndType",
+        url: "/traffic/list/vehiclesByVideoIdAndType",
         dataType: "json",
         type: "get",
         data: {

src/main/resources/static/js/manualscreen/sjcx.js

@@ -27,14 +27,6 @@ let vue_sjcx = new Vue({
             this.xzml();
         },
         xzml: function () {
-            $.ajax({
-                url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
-                dataType: "json",
-                type: "GET",
-                data: {},
-                success: function (result) {
-                    if (result.code == 0) {
-                        let parIds = result.data[0].parentId;
             $.ajax({
                 url: "/dept/listvideo",
                 dataType: "json",
@@ -47,7 +39,7 @@ let vue_sjcx = new Vue({
                 success: function (result) {
                     let defaultData = [];
                     if (result.code == 0) {
-                                    defaultData = toTree(result.data, parIds + '');
+                        defaultData = toTree(result.data,  '0');
                         $('#tree-xzxq').treeview({
                             expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
                             collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
@@ -83,9 +75,18 @@ let vue_sjcx = new Vue({
                     }
                 }
             });
-                    }
-                }
-            });
+            // $.ajax({
+            //     url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
+            //     dataType: "json",
+            //     type: "GET",
+            //     data: {},
+            //     success: function (result) {
+            //         if (result.code == 0) {
+            //             let parIds = result.data[0].parentId;
+            //
+            //         }
+            //     }
+            // });
         },
         qh_tab: function (el) {
             if (el == 1) {
@@ -120,20 +121,20 @@ let vue_sjcx = new Vue({
             vue_sjsstx.img_src_s = '';
             vue_sjsstx.data_wfsp = [];
             if (item.img1path != null) {
-                vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img1path;
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img1path});
+                vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img1path;
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img1path});
             }
             if (item.img2path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img2path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img2path});
             }
             if (item.img3path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img3path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img3path});
             }
             if (item.img4path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img4path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img4path});
             }
             if (item.img5path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img5path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img5path});
             }
             $("#myModal").modal("show");
         },
@@ -186,18 +187,14 @@ let vue_sjcx = new Vue({
                 page: pages,
                 limit: li,
                 recordtype: type,
-                checkstatus: "",
                 starttime: starttime,
                 endtime: endtime,
                 deptid: getCookie("bjpt_deptId"),
-                construction: '2',
-                objlabel: objlabels,
                 processstatus: processstatus,
-                rectificationtype:'',
                 userid:getCookie("bjpt_userId")
             };
             $.ajax({
-                url: "/TrafficStatistics/queryTraffalarmrecordByPage/0",
+                url: "/traffic/queryTraffalarmrecordByPage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -261,7 +258,7 @@ let vue_sjcx = new Vue({
                 json_s.push({id: item.id,channelid:item.channelid,fdid:item.fdid,recordtime:item.recordtime,recordtype:item.recordtype, processstatus: e});
             });
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -304,7 +301,7 @@ let vue_sjcx = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -328,7 +325,7 @@ let vue_sjcx = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -397,7 +394,7 @@ let vue_sjsstx = new Vue({
                 this.class_s = 'class_2';
                 this.class_s1 = 'class_1';
                 this.show_s = true;
-                this.video_src = '/TrafficStatistics/fielagent?ftpPath=' + this.data_sj.videopath;
+                this.video_src = '/traffic/fielagent?ftpPath=' + this.data_sj.videopath;
             }
         },
         click_img_bf: function (src) {
@@ -412,7 +409,7 @@ let vue_sjsstx = new Vue({
 //                document.getElementById("my_video_1").play();
         }
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -537,7 +534,7 @@ function deletetraff(recordid)
 {
     stop(recordid);
        $.ajax({
-        url: "/TrafficStatistics/deleteTraffalarmrecordById/"+recordid,
+        url: "/traffic/deleteTraffalarmrecordById/"+recordid,
         type: "GET",
         success: function (result) {
             if (result.code == 0) {
@@ -553,7 +550,7 @@ function deletetraff(recordid)
 function send(recordid) {
     //调用接口发送给事件推送平台，然后更新表中推送状态
     $.ajax({
-        url: "/TrafficStatistics/updateTraffalarmrecordPushStatusById/"+recordid,
+        url: "/traffic/updateTraffalarmrecordPushStatusById/"+recordid,
         type: "GET",
         success: function (result) {
             if (result.code == 0) {

src/main/resources/static/js/rgjy/rgjy.js

@@ -51,14 +51,7 @@ let vue_rgjy = new Vue({
             this.xzml();
         },
         xzml: function () {
-            $.ajax({
-                url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
-                dataType: "json",
-                type: "GET",
-                data: {},
-                success: function (result) {
-                    if (result.code == 0) {
-                        let parIds = result.data[0].parentId;
+            _this=this;
             $.ajax({
                 url: "/dept/listvideo",
                 dataType: "json",
@@ -66,14 +59,14 @@ let vue_rgjy = new Vue({
                 data: {
                     deptId: getCookie("bjpt_deptId"),
                     username: getCookie("bjpt_realName"),
-                                tdmc: vue_rgjy.searchText,
+                    tdmc: _this.searchText,
                 },
                 success: function (result) {
                     let defaultData = [];
-                                vue_rgjy.jk_arr = [];
+                    _this.jk_arr = [];
                     if (result.code == 0) {
-                                    vue_rgjy.jk_arr = result.data;
-                                    defaultData = toTree(result.data, parIds + '');
+                        _this.jk_arr = result.data;
+                        defaultData = toTree(result.data,  '0');
                         $('#tree-xzxq').treeview({
                             expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
                             collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
@@ -105,13 +98,11 @@ let vue_rgjy = new Vue({
                             }
 
                         });
-                                    vue_rgjy.query(1, true);
-                                }
-                            }
-                        });
+                        _this.query(1, true);
                     }
                 }
             });
+
         },
         qh_tab: function (el) {
             if (el == 1) {
@@ -148,7 +139,7 @@ let vue_rgjy = new Vue({
             //根据type 查询 详情
 
             $.ajax({
-                url: "/TrafficStatistics/queryTraffDetail/" + item.id + "/" + item.metatype,
+                url: "/traffic/queryTraffDetail/" + item.id + "/" + item.metatype,
                 dateType: 'json',
                 type: "GET",
                 contentType: 'application/json',
@@ -174,25 +165,25 @@ let vue_rgjy = new Vue({
                 }
             });
             if (item.imagedata != null  && item.imagedata!='') {
-                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7080"+item.imagedata;
-                    vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7080"+item.imagedata});
+                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7180"+item.imagedata;
+                    vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7180"+item.imagedata});
 
             }
             if (item.img2path != null  && item.img2path!='') {
                 if(item.img2path.indexOf("http:")>-1) {
-                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7080"+item.img2path;
+                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7180"+item.img2path;
                     vue_sjsstx.data_wfsp.push({src:  item.img2path});
                 }
             }
             if (item.img3path != null && item.img3path!='') {
                 if(item.img3path.indexOf("http:")>-1) {
-                   // vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img3path;
+                   // vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img3path;
                     vue_sjsstx.data_wfsp.push({src: item.img3path});
                 }
             }
             if (item.img4path != null && item.img4path!='') {
                 if(item.img4path.indexOf("http:")>-1) {
-                   // vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img4path;
+                   // vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img4path;
                     vue_sjsstx.data_wfsp.push({src: item.img4path});
                 }
             }
@@ -248,19 +239,15 @@ let vue_rgjy = new Vue({
                 page: pages,
                 limit: li,
                 recordtype: type,
-                checkstatus: "",
                 starttime: starttime,
                 endtime: endtime,
                 deptid: getCookie("bjpt_deptId"),
-                construction: '2',
-                objlabel: 'null',
                 processstatus: processstatus,
-                rectificationtype: '',
                 userid: getCookie("bjpt_userId"),
                 sfpf:1
             };
             $.ajax({
-                url: "/TrafficStatistics/queryTaskInfoByPage",
+                url: "/traffic/queryTaskInfoByPage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -318,7 +305,7 @@ let vue_rgjy = new Vue({
                         //     json_s.push({  id: item.id       });
                         // });
                         $.ajax({
-                            url: "/TrafficStatistics/deltaskinfoByIds",
+                            url: "/traffic/deltaskinfoByIds",
                             dateType: 'json',
                             type: "POST",
                             contentType: 'application/json',
@@ -377,7 +364,7 @@ let vue_rgjy = new Vue({
         })
             ;
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -417,7 +404,7 @@ let vue_rgjy = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -445,7 +432,7 @@ let vue_rgjy = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -734,7 +721,7 @@ let vue_sjsstxnow = new Vue({
                 processstatus: e
             });
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',

src/main/resources/static/js/sjcx/sjcx.js

@@ -128,7 +128,7 @@ let vue_sjcx = new Vue({
             //根据type 查询 详情
 
             $.ajax({
-                url: "/TrafficStatistics/queryTraffDetail/" + item.id + "/" + item.metatype,
+                url: "/traffic/queryTraffDetail/" + item.id + "/" + item.metatype,
                 dateType: 'json',
                 type: "GET",
                 contentType: 'application/json',
@@ -154,25 +154,25 @@ let vue_sjcx = new Vue({
                 }
             });
             if (item.imagedata != null  && item.imagedata!='') {
-                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7080"+item.imagedata;
-                    vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7080"+item.imagedata});
+                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7180"+item.imagedata;
+                    vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7180"+item.imagedata});
 
             }
             if (item.img2path != null  && item.img2path!='') {
                 if(item.img2path.indexOf("http:")>-1) {
-                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7080"+item.img2path;
+                    vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7180"+item.img2path;
                     vue_sjsstx.data_wfsp.push({src:  item.img2path});
                 }
             }
             if (item.img3path != null && item.img3path!='') {
                 if(item.img3path.indexOf("http:")>-1) {
-                   // vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img3path;
+                   // vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img3path;
                     vue_sjsstx.data_wfsp.push({src: item.img3path});
                 }
             }
             if (item.img4path != null && item.img4path!='') {
                 if(item.img4path.indexOf("http:")>-1) {
-                   // vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img4path;
+                   // vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img4path;
                     vue_sjsstx.data_wfsp.push({src: item.img4path});
                 }
             }
@@ -241,18 +241,14 @@ let vue_sjcx = new Vue({
                 page: pages,
                 limit: li,
                 recordtype: type,
-                checkstatus: "",
                 starttime: starttime,
                 endtime: endtime,
                 deptid: getCookie("bjpt_deptId"),
-                construction: '2',
-                objlabel: objlabels,
                 processstatus: processstatus,
-                rectificationtype: '',
                 userid: getCookie("bjpt_userId")
             };
             $.ajax({
-                url: "/TrafficStatistics/queryTraffalarmrecordByPage/1",
+                url: "/traffic/queryTraffalarmrecordByPage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -333,7 +329,7 @@ let vue_sjcx = new Vue({
         })
             ;
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -375,7 +371,7 @@ let vue_sjcx = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -401,7 +397,7 @@ let vue_sjcx = new Vue({
             }
         });
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -688,7 +684,7 @@ let vue_sjsstxnow = new Vue({
                 processstatus: e
             });
             $.ajax({
-                url: "/TrafficStatistics/updateTraffalarmrecordById",
+                url: "/traffic/updateTraffalarmrecordById",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -923,9 +919,9 @@ wss.onmessage = function (evt) {
         //违法图片
         let wfsp = [];
         if (null != data.imagedata && "" != data.imagedata) {
-            data.imagedata="http://zjh189.ncpoi.cc:7080"+ data.imagedata;
+            data.imagedata="http://zjh189.ncpoi.cc:7180"+ data.imagedata;
         }
-        wfsp.push({img_src:"http://zjh189.ncpoi.cc:7080"+data.imagedata});
+        wfsp.push({img_src:"http://zjh189.ncpoi.cc:7180"+data.imagedata});
         //右边消息弹出框的id
         let tss = 'a' + data.createtime;
         //判断三级弹出框是否已经弹出，没有弹出，则清空，若是弹出，则继续push

src/main/resources/static/js/sjfx/sjfx.js

@@ -143,7 +143,7 @@ let vue_sjcx = new Vue({
             vue_sjcx.jrll_sjlx_data.push({sj: others, type: '其它车辆'});
             //今日事件
             $.ajax({
-                url: "/TrafficStatistics/list/todaytraffRecords",
+                url: "/traffic/list/todaytraffRecords",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -176,7 +176,7 @@ let vue_sjcx = new Vue({
             });
             //本月事件
             $.ajax({
-                url: "/TrafficStatistics/list/todaytraffRecords",
+                url: "/traffic/list/todaytraffRecords",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -209,7 +209,7 @@ let vue_sjcx = new Vue({
             });
             //今日流量
             $.ajax({
-                url: "/TrafficStatistics/list/todayvehiclesByVideoId",
+                url: "/traffic/list/todayvehiclesByVideoId",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -230,7 +230,7 @@ let vue_sjcx = new Vue({
             });
             //今日实时事件
             $.ajax({
-                url: "/TrafficStatistics/list/todaytraffRecordByeveryhour",
+                url: "/traffic/list/todaytraffRecordByeveryhour",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -294,7 +294,7 @@ let vue_sjcx = new Vue({
             });
             //今日实时流量
             $.ajax({
-                url: "/TrafficStatistics/list/todayvehiclesByeveryhour",
+                url: "/traffic/list/todayvehiclesByeveryhour",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -348,7 +348,7 @@ let vue_sjcx = new Vue({
         //历史事件
         query_history_sj: function (kssj, jssj, id) {
             $.ajax({
-                url: "/TrafficStatistics/list/historytraffRecords",
+                url: "/traffic/list/historytraffRecords",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -422,7 +422,7 @@ let vue_sjcx = new Vue({
         //历史流量
         query_history_ll: function (kssj, jssj, id) {
             $.ajax({
-                url: "/TrafficStatistics/list/historyvehicles",
+                url: "/traffic/list/historyvehicles",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -492,7 +492,7 @@ let vue_sjcx = new Vue({
             }
             $("#loadingModal").modal('show');
             $.ajax({
-                url: "/TrafficStatistics/list/vehiclesByVideoIdAndType",
+                url: "/traffic/list/vehiclesByVideoIdAndType",
                 dataType: "json",
                 type: "get",
                 data: {

src/main/resources/static/js/tsgl/sbts.js

@@ -45,7 +45,7 @@ let vue_sjcx = new Vue({
         },
         query: function (pages, items) {
             $.ajax({
-                url: "/TrafficStatistics/list/pushrecordsBypage",
+                url: "/traffic/list/pushrecordsBypage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',

src/main/resources/static/js/tsgl/sjts.js

@@ -72,29 +72,18 @@ let vue_sjcx = new Vue({
             vue_sjsstx.show_s = false;
             vue_sjsstx.img_src_s = '';
             vue_sjsstx.data_wfsp = [];
-            if (item.img1path != null) {
-                vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img1path;
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img1path});
-            }
-            if (item.img2path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img2path});
-            }
-            if (item.img3path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img3path});
-            }
-            if (item.img4path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img4path});
-            }
-            if (item.img5path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img5path});
+            if (item.imagedata != null) {
+                vue_sjsstx.img_src_s = "http://zjh189.ncpoi.cc:7180" + item.imagedata;
+                vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7180" + item.imagedata});
             }
+
             $("#myModal").modal("show");
         },
         query: function (pages, items) {
             let starttime = $("#kssj").val().substr(0, 19);
             let endtime = $("#kssj").val().substr(22, 19);
             $.ajax({
-                url: "/TrafficStatistics/list/pushrecordsBypage",
+                url: "/traffic/list/pushrecordsBypage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',
@@ -152,7 +141,7 @@ let vue_sjcx = new Vue({
     mounted(){
         $("#kssj").val(getTime_extent(6).pre_rq_start + ' - ' + getTime().jssj);
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -199,7 +188,7 @@ let vue_sjsstx = new Vue({
                 this.class_s = 'class_2';
                 this.class_s1 = 'class_1';
                 this.show_s = true;
-                this.video_src = '/TrafficStatistics/fielagent?ftpPath=' + this.data_sj.videopath;
+                this.video_src = '/traffic/fielagent?ftpPath=' + this.data_sj.videopath;
             }
         },
         click_img_bf: function (src) {
@@ -272,21 +261,9 @@ let vue_ts = new Vue({
             vue_sjsstx.show_s = false;
             vue_sjsstx.img_src_s = '';
             vue_sjsstx.data_wfsp = [];
-            if (item.img1path != null) {
-                vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img1path;
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img1path});
-            }
-            if (item.img2path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img2path});
-            }
-            if (item.img3path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img3path});
-            }
-            if (item.img4path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img4path});
-            }
-            if (item.img5path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img5path});
+            if (item.imagedata != null) {
+                vue_sjsstx.img_src_s ="http://zjh189.ncpoi.cc:7180"+ item.imagedata;
+                vue_sjsstx.data_wfsp.push({src: "http://zjh189.ncpoi.cc:7180" + item.imagedata});
             }
             $("#myModal").modal("show");
         },

src/main/resources/static/js/tsgl/tstj.js

@@ -49,7 +49,7 @@ let vue_sjcx = new Vue({
                 areaid: this.bmid,
             };
             $.ajax({
-                url: "/TrafficStatistics/list/eventresultBypage",
+                url: "/traffic/list/eventresultBypage",
                 dateType: 'json',
                 type: "post",
                 contentType: 'application/json',
@@ -117,7 +117,7 @@ let vue_sjcx = new Vue({
         $("#kssj").val(getTime_extent(15).pre_rq + ' - ' + getTime().jssj_big);
         $("#kssj1").val(getTime().kssj_ym + ' - ' + getTime().kssj_ym);
         $.ajax({
-            url: "/TrafficStatistics/listcode",
+            url: "/traffic/listcode",
             dataType: "json",
             type: "GET",
             data: {
@@ -140,14 +140,6 @@ let vue_sjcx = new Vue({
                 }
             }
         });
-        $.ajax({
-            url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
-            dataType: "json",
-            type: "GET",
-            data: {},
-            success: function (result) {
-                if (result.code == 0) {
-                    let parIds = result.data[0].parentId;
         $.ajax({
             url: "/dept/listvideo",
             dataType: "json",
@@ -160,7 +152,7 @@ let vue_sjcx = new Vue({
             success: function (result) {
                 let defaultData = [];
                 if (result.code == 0) {
-                                defaultData = toTree(result.data, parIds + '');
+                    defaultData = toTree(result.data, '0');
                     $('#tree-xzxq').treeview({
                         expandIcon: 'glyphicon glyphicon-triangle-right selected-span',
                         collapseIcon: 'glyphicon glyphicon-triangle-bottom selected-span',
@@ -180,9 +172,18 @@ let vue_sjcx = new Vue({
                 }
             }
         });
-                }
-            }
-        });
+        // $.ajax({
+        //     url: "/dept/getDeptParent/" + getCookie("bjpt_deptId"),
+        //     dataType: "json",
+        //     type: "GET",
+        //     data: {},
+        //     success: function (result) {
+        //         if (result.code == 0) {
+        //             let parIds = result.data[0].parentId;
+        //
+        //         }
+        //     }
+        // });
         this.query(1, true);
     },
 
@@ -209,7 +210,7 @@ let vue_sjsstx = new Vue({
                 this.class_s = 'class_2';
                 this.class_s1 = 'class_1';
                 this.show_s = true;
-                this.video_src = '/TrafficStatistics/fielagent?ftpPath=' + this.data_sj.videopath;
+                this.video_src = '/traffic/fielagent?ftpPath=' + this.data_sj.videopath;
             }
         },
         click_img_bf: function (src) {
@@ -242,20 +243,20 @@ let vue_myModal_sj = new Vue({
             vue_sjsstx.img_src_s = '';
             vue_sjsstx.data_wfsp = [];
             if (item.img1path != null) {
-                vue_sjsstx.img_src_s = '/TrafficStatistics/fielagent?ftpPath=' + item.img1path;
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img1path});
+                vue_sjsstx.img_src_s = '/traffic/fielagent?ftpPath=' + item.img1path;
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img1path});
             }
             if (item.img2path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img2path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img2path});
             }
             if (item.img3path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img3path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img3path});
             }
             if (item.img4path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img4path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img4path});
             }
             if (item.img5path != null) {
-                vue_sjsstx.data_wfsp.push({src: '/TrafficStatistics/fielagent?ftpPath=' + item.img5path});
+                vue_sjsstx.data_wfsp.push({src: '/traffic/fielagent?ftpPath=' + item.img5path});
             }
             $("#myModal").modal("show");
         },
@@ -270,17 +271,14 @@ let vue_myModal_sj = new Vue({
                 page: pages,
                 limit: this.fy_select,
                 recordtype: vue_sjcx.cllx_select.toLocaleLowerCase(),
-                checkstatus: "",
                 starttime: vue_sjcx.countdate_s+' 00:00:00',
                 endtime: vue_sjcx.countdate_s+' 23:59:59',
                 deptid: vue_sjcx.bmid,
-                objlabel:"",
                 processstatus:"",
-                rectificationtype:'',
                 userid:getCookie("bjpt_userId")
             }
             $.ajax({
-                url: "/TrafficStatistics/queryTraffalarmrecordByPage/1",
+                url: "/traffic/queryTraffalarmrecordByPage",
                 dateType: 'json',
                 type: "POST",
                 contentType: 'application/json',

src/main/resources/static/js/xtgl/sjdj.js

@@ -36,7 +36,7 @@ let vue_sjcx1 = new Vue({
         },
         query: function () {
             $.ajax({
-                url: "/TrafficStatistics/listcode",
+                url: "/traffic/listcode",
                 dataType: "json",
                 type: "GET",
                 data: {
@@ -57,7 +57,7 @@ let vue_sjcx1 = new Vue({
         },
         cxsjlx: function () {
             $.ajax({
-                url: "/TrafficStatistics/listcode",
+                url: "/traffic/listcode",
                 dataType: "json",
                 type: "GET",
                 data: {

src/main/resources/static/js/xtgl/xtgl.js

@@ -342,17 +342,6 @@ let vue_sjcx1 = new Vue({
 });
 //endregion
 
-let as = [{
-    id: 46446,
-    text: 'Languages',
-    children: [{
-        id: 646545,
-        text: 'Java'
-    }, {
-        id: 5634,
-        text: 'C++'
-    }]
-}];
 $("#department1").combotree({
     data: as,//获取要显示的json数据
     valueField: 'id',

src/main/resources/templates/dept/dept-list.html

@@ -63,14 +63,14 @@
     </div>
 </div>
 
-<!--<script type="text/html" id="toolbar">-->
-    <!--<shiro:hasPermission name="dept:add">-->
-        <!--<button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add">-->
-            <!--<i class="zadmin-icon zadmin-icon-xinzeng zadmin-oper-area"></i>-->
-            <!--新增-->
-        <!--</button>-->
-    <!--</shiro:hasPermission>-->
-<!--</script>-->
+<script type="text/html" id="toolbar">
+    <shiro:hasPermission name="dept:add">
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="add">
+            <i class="zadmin-icon zadmin-icon-xinzeng zadmin-oper-area"></i>
+            新增
+        </button>
+    </shiro:hasPermission>
+</script>
 
 
 <script type="text/html" id="column-toolbar">
@@ -143,7 +143,7 @@
             initLevel: 5,   // 初始打开节点级别
             method: "GET",
             dot: false,     // 圆点是否显示
-            toolbar: false,  // 右键工具栏
+            toolbar: true,  // 右键工具栏
             menubar: true,  // 树上方工具栏, 展开、收缩、刷新、搜索等
             toolbarShow: [],
             toolbarScroll: "#toolbarDiv",
@@ -215,7 +215,7 @@
                     , {field: 'id', title: 'ID', hide: true}
                     , {field: 'name', title: '名称'}
 //                        , {title: '排序', fixed: 'right', align: 'center', toolbar: '#column-toolbar-sort'}
-//                    , {title: '操作', align: 'center', toolbar: '#column-toolbar'}
+                   , {title: '操作', align: 'center', toolbar: '#column-toolbar'}
                 ]
             ]
         });

src/main/resources/templates/flv.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="bootstrap/css/bootstrap.css">
     <link rel="stylesheet" href="css/main.css">
-    <title>视频分析系统</title>
+    <title>AI业务管理平台</title>
 </head>
 <body>
 <div class="container-index">

src/main/resources/templates/login.html

@@ -54,7 +54,7 @@
     </style>
 </head>
 <body>
-<div class="text">视频分析系统</div>
+<div class="text">AI业务管理平台</div>
 <div class="login-main">
     <header class="layui-elip">登录</header>
     <form class="layui-form">

src/main/resources/templates/main.html

@@ -6,13 +6,13 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="bootstrap/css/bootstrap.css">
     <link rel="stylesheet" href="css/main.css">
-    <title>视频分析系统</title>
+    <title>AI业务管理平台</title>
 </head>
 <body>
 <div class="container-index">
     <div class="top-nav">
         <img src="images/security.png" class="gh-img">
-        <span class="title">视频分析系统</span>
+        <span class="title">AI业务管理平台</span>
         <ul class="nav navbar-nav navbar-right admin">
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"

src/main/resources/templates/page/rgjy.html

@@ -64,7 +64,7 @@
                                     </div>
                                     <div class="show-icon" :style="{'background':(item.processstatus==null||item.processstatus==0||item.processstatus==-1)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==null||item.processstatus==0||item.processstatus==-1?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
                                     <div class="li-top">
-                                        <img :src="'http://zjh189.ncpoi.cc:7080'+item.imagedata" :id="'img'+item.id">
+                                        <img :src="'http://zjh189.ncpoi.cc:7180'+item.imagedata" :id="'img'+item.id">
 <!--                                        <canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas>-->
                                     </div>
                                     <div class="li-center">

src/main/resources/templates/page/rwpfhistory.html

@@ -70,7 +70,7 @@
                                     </div>
                                     <div class="show-icon" :style="{'background':(item.processstatus==null||item.processstatus==0||item.processstatus==-1)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==null||item.processstatus==0||item.processstatus==-1?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
                                     <div class="li-top">
-                                        <img :src="'http://zjh189.ncpoi.cc:7080'+item.imagedata" :id="'img'+item.id">
+                                        <img :src="'http://zjh189.ncpoi.cc:7180'+item.imagedata" :id="'img'+item.id">
 <!--                                        <canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas>-->
                                     </div>
                                     <div class="li-center">

src/main/resources/templates/page/sjcx (2).html

@@ -91,7 +91,7 @@
                                     </div>
                                     <div class="show-icon" :style="{'background':(item.processstatus==0||item.processstatus==null)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==0||item.processstatus==null?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
                                     <div class="li-top">
-                                        <img :src="'/TrafficStatistics/fielagent?ftpPath='+item.img1path">
+                                        <img :src="'/traffic/fielagent?ftpPath='+item.img1path">
                                     </div>
                                     <div class="li-center">
                                         <div>

src/main/resources/templates/page/sjcx.html

@@ -88,7 +88,7 @@
                                     <!--</div>-->
                                     <div class="show-icon" :style="{'background':(item.processstatus==0||item.processstatus==null||item.processstatus==-1)?'#ff9c2b':(item.processstatus==2)?'#fc3939':(item.processstatus==1)?'#2fba08':'#cccccc'}" v-text="item.processstatus==null||item.processstatus==0||item.processstatus==-1?'未处理':item.processstatus==1?'正检':item.processstatus==2?'误检':'重复事件'"></div>
                                     <div class="li-top">
-                                        <img :src="'http://zjh189.ncpoi.cc:7080'+item.imagedata" :id="'img'+item.id">
+                                        <img :src="'http://zjh189.ncpoi.cc:7180'+item.imagedata" :id="'img'+item.id">
 <!--                                        <canvas :id="'cvs'+item.id" style="position: absolute;pointer-events: none;left:0;width:100%;height:100%"></canvas>-->
                                     </div>
                                     <div class="li-center">

src/main/resources/templates/page/sjts.html

@@ -40,7 +40,7 @@
                             <span class="pub-span" style="margin-left: 10px;" >监控名称</span>
                             <input type="text" class="form-control input-pub" style="width: 300px;" id="tdmc">
                             <button type="button" class="btn btn-sm pub-btn" style="margin-left: 30px;" @click="getChange()">查询</button>
-                            <button type="button" class="btn btn-sm pub-btn" style="margin-left: 30px;" @click="tss()" v-show="tssj_s">推送</button>
+                            <!--<button type="button" class="btn btn-sm pub-btn" style="margin-left: 30px;" @click="tss()" v-show="tssj_s">推送</button>-->
                         </div>
                         <div style="height:calc(100% - 130px);margin-top: 20px;" class="tables">
                             <table class="table table-td" style="text-align: center;">

src/main/resources/templates/page/test.html

@@ -13,7 +13,7 @@
 </style>
 
 <body style="width:100%;height:400px">
-<canvas id="draw-canvas" width="100%" height="400px" style="border:1px solid #d3d3d3;">
+<canvas id="draw-canvas" width="100%" height="100%" style="border:1px solid #d3d3d3;">
 </canvas>
 <!-- <button id="up">增大</button><button id="down">减小</button><button id="cancel">撤销</button><button
     id="clear">清空</button> -->

src/main/resources/templates/role/role-list.html

@@ -207,7 +207,7 @@
                         success: function(layero, index){
                             vdtree.render({
                                 obj: $(layero).find("#videoTree"),
-                                url:"/depttree/videotree/"+data.roleId,
+                                url:"/depttree/videotree/"+data.roleId+"/"+getCookie("bjpt_realName"),
                                 dataStyle: "layuiStyle",
                                 method: "GET",
                                 dot: false,

src/main/resources/templates/user/user-add.html

@@ -40,7 +40,7 @@
                 </div>
             </div>
             <div class="layui-form-item">
-                <label for="realname" class="layui-form-label">
+                <label for="realName" class="layui-form-label">
                     姓名
                 </label>
                 <div class="layui-input-block">
@@ -82,28 +82,28 @@
             </div>
 
 
-            <div class="layui-form-item">
-                <label for="lxdh" class="layui-form-label">
-                    联系方式
-                </label>
-                <div class="layui-input-block">
-                    <input type="text" id="lxdh" name="lxdh"  th:value="${user?.lxdh}"
-                           autocomplete="off" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label for="email" class="layui-form-label">
-                    邮箱
-                </label>
-                <div class="layui-input-block">
-                    <input type="text" id="email" name="email"  th:value="${user?.email}"
-                           autocomplete="off" class="layui-input">
-                </div>
-            </div>
+            <!--<div class="layui-form-item">-->
+                <!--<label for="lxdh" class="layui-form-label">-->
+                    <!--联系方式-->
+                <!--</label>-->
+                <!--<div class="layui-input-block">-->
+                    <!--<input type="text" id="lxdh" name="lxdh"  th:value="${user?.lxdh}"-->
+                           <!--autocomplete="off" class="layui-input">-->
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="layui-form-item">-->
+                <!--<label for="email" class="layui-form-label">-->
+                    <!--邮箱-->
+                <!--</label>-->
+                <!--<div class="layui-input-block">-->
+                    <!--<input type="text" id="email" name="email"  th:value="${user?.email}"-->
+                           <!--autocomplete="off" class="layui-input">-->
+                <!--</div>-->
+            <!--</div>-->
             <div class="layui-form-item">
                 <div class="layui-input-block" style="margin-left:0;text-align:center;">
                         <input type="hidden" id="deptId" name="deptId" th:value="${user?.deptId}">
-                        <input type="hidden" id="videoId" name="videoId" th:value="${user?.videoId}">
+                        <!--<input type="hidden" id="videoId" name="videoId" th:value="${user?.videoId}">-->
                     <input type="hidden" id="userId" name="userId" th:value="${user?.userId}">
                     <button th:text="${user}?'修改':'增加'"  class="layui-btn layui-btn-normal btn-w100" lay-submit="" data-th-lay-filter="${user}?'edit':'add'"></button>
                 </div>
@@ -156,37 +156,37 @@
             dtree.on("node('deptTree')" ,function(obj){
                 $("#deptId").val(obj.param.nodeId);
             });
-            vtree.render({
-                elem: "#videoTree",
-                url: "/depttree/videotree/"+getCookie("bjpt_deptId"),
-                dataStyle: "layuiStyle",
-                width: "100%",
-                method: "GET",
-                dot: false,
-                checkbar: true, // 开启复选框
-                checkbarType: "all",
-                menubar: true,
-                response: {
-                    statusCode: 0,
-                    message: "msg",
-                    treeId: "id",
-                    parentId: "parentId",
-                    title: "name"
-                },
-                done: function() {
-                   layui.$.get('/listeventByvideoid/' + videoId , function (data) {
-                                        vtree.chooseDataInit("videoTree", data.data.toString()); // 初始化复选框的值
-                                    });
-                <!---->
-                    <!--var videoId = [[${user?.videoId + ''}]] ;-->
-                    <!--dtree.dataInit("videoTree", videoId);-->
-                    <!--dtree.setSelectValue("videoTree");-->
-                }
-            });
+            // vtree.render({
+            //     elem: "#videoTree",
+            //     url: "/depttree/videotree/"+getCookie("bjpt_deptId")+"/"+getCookie("bjpt_realName"),
+            //     dataStyle: "layuiStyle",
+            //     width: "100%",
+            //     method: "GET",
+            //     dot: false,
+            //     checkbar: true, // 开启复选框
+            //     checkbarType: "all",
+            //     menubar: true,
+            //     response: {
+            //         statusCode: 0,
+            //         message: "msg",
+            //         treeId: "id",
+            //         parentId: "parentId",
+            //         title: "name"
+            //     },
+            //     done: function() {
+            //        layui.$.get('/listeventByvideoid/' + videoId , function (data) {
+            //                             vtree.chooseDataInit("videoTree", data.data.toString()); // 初始化复选框的值
+            //                         });
+            //     <!---->
+            //         <!--var videoId = [[${user?.videoId + ''}]] ;-->
+            //         <!--dtree.dataInit("videoTree", videoId);-->
+            //         <!--dtree.setSelectValue("videoTree");-->
+            //     }
+            // });
 
-            vtree.on("node('videoTree')" ,function(obj){
-                $("#videoId").val(obj.param.nodeId);
-            });
+            // vtree.on("node('videoTree')" ,function(obj){
+            //     $("#videoId").val(obj.param.nodeId);
+            // });
 
 
             form.on('submit(add)', function (form) {

src/main/resources/templates/user/user-list.html

@@ -177,8 +177,8 @@
                         ,{field: 'userId', title: 'ID', width: "10%", hide: true}
                         , {field: 'username', title: '用户名', width: "15%"}
                         , {field: 'deptName', title: '部门', width: "12%"}
-                        , {field: 'lxdh', title: '联系方式', width: "12%"}
-                        , {field: 'email', title: '邮箱', width: "12%"}
+                        // , {field: 'lxdh', title: '联系方式', width: "12%"}
+                        // , {field: 'email', title: '邮箱', width: "12%"}
                         , {field: 'createTime', title: '创建时间', width: "12%"}
 //                        , {field: 'lastLoginTime', title: '最后登陆时间', width: "12%"}
                         , {field: 'status', title: '状态', templet: "#statusTpl", width: "12%"}