添加任务派发功能

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>im.zhaojun</groupId>
+    <groupId>im.dx</groupId>
     <artifactId>zjgszdVideoAlarmService</artifactId>
     <version>0.6</version>
     <packaging>jar</packaging>
@@ -172,7 +172,12 @@
             <artifactId>poi</artifactId>
             <version>3.8-beta5</version>
         </dependency>
-
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

src/main/java/im/zhaojun/common/annotation/OperationLog.java → src/main/java/im/dx/common/annotation/OperationLog.java

-package im.zhaojun.common.annotation;
+package im.dx.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/im/zhaojun/common/annotation/RefreshFilterChain.java → src/main/java/im/dx/common/annotation/RefreshFilterChain.java

-package im.zhaojun.common.annotation;
+package im.dx.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/im/zhaojun/common/aop/LoginLogAspect.java → src/main/java/im/dx/common/aop/LoginLogAspect.java

-package im.zhaojun.common.aop;
+package im.dx.common.aop;
 
-import im.zhaojun.common.util.IPUtils;
-import im.zhaojun.system.model.User;
-import im.zhaojun.system.service.LoginLogService;
+import im.dx.common.util.IPUtils;
+import im.dx.system.model.User;
+import im.dx.system.service.LoginLogService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.aspectj.lang.JoinPoint;
@@ -22,7 +22,7 @@ public class LoginLogAspect {
     @Resource
     private LoginLogService loginLogService;
 
-    @Pointcut("execution(im.zhaojun.common.util.ResultBean im.zhaojun.system.controller..LoginController.login(im.zhaojun.system.model.User, String) )")
+    @Pointcut("execution(im.dx.common.util.ResultBean im.dx.system.controller..LoginController.login(im.dx.system.model.User, String) )")
     public void loginLogPointCut() {}
 
     @After("loginLogPointCut()")

src/main/java/im/zhaojun/common/aop/OperationLogAspect.java → src/main/java/im/dx/common/aop/OperationLogAspect.java

-package im.zhaojun.common.aop;
+package im.dx.common.aop;
 
-import im.zhaojun.common.annotation.OperationLog;
-import im.zhaojun.common.util.IPUtils;
-import im.zhaojun.common.util.ShiroUtil;
-import im.zhaojun.system.mapper.SysLogMapper;
-import im.zhaojun.system.model.SysLog;
-import im.zhaojun.system.model.User;
+import im.dx.common.annotation.OperationLog;
+import im.dx.common.util.IPUtils;
+import im.dx.common.util.ShiroUtil;
+import im.dx.system.mapper.SysLogMapper;
+import im.dx.system.model.SysLog;
+import im.dx.system.model.User;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -30,7 +30,7 @@ public class OperationLogAspect {
     @Resource
     private SysLogMapper sysLogMapper;
 
-    @Pointcut("@annotation(im.zhaojun.common.annotation.OperationLog)")
+    @Pointcut("@annotation(im.dx.common.annotation.OperationLog)")
     public void pointcut() {
     }
 

src/main/java/im/zhaojun/common/aop/RefreshFilterChainAspect.java → src/main/java/im/dx/common/aop/RefreshFilterChainAspect.java

-package im.zhaojun.common.aop;
+package im.dx.common.aop;
 
-import im.zhaojun.system.service.ShiroService;
+import im.dx.system.service.ShiroService;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -18,7 +18,7 @@ public class RefreshFilterChainAspect {
     @Resource
     private ShiroService shiroService;
 
-    @Pointcut("@annotation(im.zhaojun.common.annotation.RefreshFilterChain)")
+    @Pointcut("@annotation(im.dx.common.annotation.RefreshFilterChain)")
     public void updateFilterChain() {}
 
     @AfterReturning("updateFilterChain()")

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

-package im.zhaojun.common.config;
+package im.dx.common.config;
 
 import at.pollux.thymeleaf.shiro.dialect.ShiroDialect;
-import im.zhaojun.common.shiro.EnhanceModularRealmAuthenticator;
-import im.zhaojun.common.shiro.OAuth2Helper;
-import im.zhaojun.common.shiro.RestShiroFilterFactoryBean;
-import im.zhaojun.common.shiro.ShiroActionProperties;
-import im.zhaojun.common.shiro.credential.RetryLimitHashedCredentialsMatcher;
-import im.zhaojun.common.shiro.filter.OAuth2AuthenticationFilter;
-import im.zhaojun.common.shiro.filter.RestAuthorizationFilter;
-import im.zhaojun.common.shiro.filter.RestFormAuthenticationFilter;
-import im.zhaojun.common.shiro.realm.OAuth2GiteeRealm;
-import im.zhaojun.common.shiro.realm.OAuth2GithubRealm;
-import im.zhaojun.common.shiro.realm.UserNameRealm;
-import im.zhaojun.system.service.MyWebSocketClient;
-import im.zhaojun.system.service.ShiroService;
+import im.dx.common.shiro.EnhanceModularRealmAuthenticator;
+import im.dx.common.shiro.OAuth2Helper;
+import im.dx.common.shiro.RestShiroFilterFactoryBean;
+import im.dx.common.shiro.ShiroActionProperties;
+import im.dx.common.shiro.credential.RetryLimitHashedCredentialsMatcher;
+import im.dx.common.shiro.filter.OAuth2AuthenticationFilter;
+import im.dx.common.shiro.filter.RestAuthorizationFilter;
+import im.dx.common.shiro.filter.RestFormAuthenticationFilter;
+import im.dx.common.shiro.realm.OAuth2GiteeRealm;
+import im.dx.common.shiro.realm.OAuth2GithubRealm;
+import im.dx.common.shiro.realm.UserNameRealm;
+import im.dx.system.service.ShiroService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
 import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
@@ -30,8 +29,6 @@ import org.springframework.context.annotation.Lazy;
 
 import javax.annotation.Resource;
 import javax.servlet.Filter;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Map;
 

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

-package im.zhaojun.common.config;
+package im.dx.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/im/zhaojun/common/config/ThreadConfig.java → src/main/java/im/dx/common/config/ThreadConfig.java

-package im.zhaojun.common.config;
+package im.dx.common.config;
 
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Configuration;

src/main/java/im/zhaojun/common/config/WebMvcConfig.java → src/main/java/im/dx/common/config/WebMvcConfig.java

-package im.zhaojun.common.config;
+package im.dx.common.config;
 
-import im.zhaojun.common.interceptor.LogMDCInterceptor;
-import im.zhaojun.common.interceptor.RequestLogHandlerInterceptor;
+import im.dx.common.interceptor.LogMDCInterceptor;
+import im.dx.common.interceptor.RequestLogHandlerInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/im/zhaojun/common/config/WebSocketConfig.java → src/main/java/im/dx/common/config/WebSocketConfig.java

-package im.zhaojun.common.config;
+package im.dx.common.config;
 
 
 import cn.hutool.json.JSONUtil;
-import im.zhaojun.system.mapper.AlarmMapper;
-import im.zhaojun.system.model.Alarm;
+import im.dx.system.mapper.AlarmMapper;
+import im.dx.system.model.Alarm;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft_6455;

src/main/java/im/zhaojun/common/constants/AuthcTypeEnum.java → src/main/java/im/dx/common/constants/AuthcTypeEnum.java

-package im.zhaojun.common.constants;
+package im.dx.common.constants;
 
 /**
  * 登录认证类型 枚举类

src/main/java/im/zhaojun/common/exception/AuthcTypeNotSupportException.java → src/main/java/im/dx/common/exception/AuthcTypeNotSupportException.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 public class AuthcTypeNotSupportException extends RuntimeException {
 

src/main/java/im/zhaojun/common/exception/CaptchaIncorrectException.java → src/main/java/im/dx/common/exception/CaptchaIncorrectException.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 import org.apache.shiro.authc.AuthenticationException;
 

src/main/java/im/zhaojun/common/exception/DuplicateNameException.java → src/main/java/im/dx/common/exception/DuplicateNameException.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 public class DuplicateNameException extends RuntimeException {
 

src/main/java/im/zhaojun/common/exception/MyErrorAttributes.java → src/main/java/im/dx/common/exception/MyErrorAttributes.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
 import org.springframework.stereotype.Component;

src/main/java/im/zhaojun/common/exception/TreeCastException.java → src/main/java/im/dx/common/exception/TreeCastException.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 public class TreeCastException extends RuntimeException {
     private static final long serialVersionUID = -7358633666514111106L;

src/main/java/im/zhaojun/common/exception/UnknownRedirectUrlException.java → src/main/java/im/dx/common/exception/UnknownRedirectUrlException.java

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
 public class UnknownRedirectUrlException extends RuntimeException{
 

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

-package im.zhaojun.common.exception;
+package im.dx.common.exception;
 
-import im.zhaojun.common.util.ResultBean;
+import im.dx.common.util.ResultBean;
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.shiro.authc.ExcessiveAttemptsException;
 import org.apache.shiro.authc.IncorrectCredentialsException;

src/main/java/im/zhaojun/common/information/Mem.java → src/main/java/im/dx/common/information/Mem.java

-package im.zhaojun.common.information;
+package im.dx.common.information;
 
 
 /**

src/main/java/im/zhaojun/common/information/Sys.java → src/main/java/im/dx/common/information/Sys.java

-package im.zhaojun.common.information;
+package im.dx.common.information;
 
 /**
  * 系统相关信息

src/main/java/im/zhaojun/common/information/SysFile.java → src/main/java/im/dx/common/information/SysFile.java

-package im.zhaojun.common.information;
+package im.dx.common.information;
 
 /**
  * 系统文件相关信息

src/main/java/im/zhaojun/common/interceptor/LogMDCInterceptor.java → src/main/java/im/dx/common/interceptor/LogMDCInterceptor.java

-package im.zhaojun.common.interceptor;
+package im.dx.common.interceptor;
 
-import im.zhaojun.common.util.IPUtils;
-import im.zhaojun.system.model.User;
+import im.dx.common.util.IPUtils;
+import im.dx.system.model.User;
 import org.apache.shiro.SecurityUtils;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;

src/main/java/im/zhaojun/common/interceptor/RequestLogHandlerInterceptor.java → src/main/java/im/dx/common/interceptor/RequestLogHandlerInterceptor.java

-package im.zhaojun.common.interceptor;
+package im.dx.common.interceptor;
 
 import cn.hutool.json.JSONUtil;
 import org.slf4j.Logger;

src/main/java/im/zhaojun/common/shiro/OAuth2Helper.java → src/main/java/im/dx/common/shiro/OAuth2Helper.java

-package im.zhaojun.common.shiro;
+package im.dx.common.shiro;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
-import im.zhaojun.common.exception.AuthcTypeNotSupportException;
+import im.dx.common.constants.AuthcTypeEnum;
+import im.dx.common.exception.AuthcTypeNotSupportException;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.request.AuthGiteeRequest;
 import me.zhyd.oauth.request.AuthGithubRequest;

src/main/java/im/zhaojun/common/shiro/RestPathMatchingFilterChainResolver.java → src/main/java/im/dx/common/shiro/RestPathMatchingFilterChainResolver.java

-package im.zhaojun.common.shiro;
+package im.dx.common.shiro;
 
-import im.zhaojun.common.util.WebHelper;
+import im.dx.common.util.WebHelper;
 import org.apache.shiro.web.filter.mgt.FilterChainManager;
 import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
 import org.slf4j.Logger;

src/main/java/im/zhaojun/common/shiro/RestShiroFilterFactoryBean.java → src/main/java/im/dx/common/shiro/RestShiroFilterFactoryBean.java

-package im.zhaojun.common.shiro;
+package im.dx.common.shiro;
 
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;

src/main/java/im/zhaojun/common/shiro/ShiroActionProperties.java → src/main/java/im/dx/common/shiro/ShiroActionProperties.java

-package im.zhaojun.common.shiro;
+package im.dx.common.shiro;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
+import im.dx.common.constants.AuthcTypeEnum;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;

src/main/java/im/zhaojun/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java → src/main/java/im/dx/common/shiro/credential/RetryLimitHashedCredentialsMatcher.java

-package im.zhaojun.common.shiro.credential;
+package im.dx.common.shiro.credential;
 
-import im.zhaojun.common.shiro.ShiroActionProperties;
-import im.zhaojun.common.util.IPUtils;
+import im.dx.common.shiro.ShiroActionProperties;
+import im.dx.common.util.IPUtils;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.ExcessiveAttemptsException;

src/main/java/im/zhaojun/common/shiro/filter/OAuth2AuthenticationFilter.java → src/main/java/im/dx/common/shiro/filter/OAuth2AuthenticationFilter.java

-package im.zhaojun.common.shiro.filter;
+package im.dx.common.shiro.filter;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
-import im.zhaojun.common.exception.UnknownRedirectUrlException;
-import im.zhaojun.common.shiro.OAuth2Helper;
-import im.zhaojun.common.shiro.token.OAuth2Token;
-import im.zhaojun.common.util.WebHelper;
+import im.dx.common.constants.AuthcTypeEnum;
+import im.dx.common.exception.UnknownRedirectUrlException;
+import im.dx.common.shiro.OAuth2Helper;
+import im.dx.common.shiro.token.OAuth2Token;
+import im.dx.common.util.WebHelper;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authc.AuthenticatingFilter;

src/main/java/im/zhaojun/common/shiro/filter/RestAuthorizationFilter.java → src/main/java/im/dx/common/shiro/filter/RestAuthorizationFilter.java

-package im.zhaojun.common.shiro.filter;
+package im.dx.common.shiro.filter;
 
-import im.zhaojun.common.util.IPUtils;
-import im.zhaojun.common.util.ResultBean;
-import im.zhaojun.common.util.WebHelper;
+import im.dx.common.util.IPUtils;
+import im.dx.common.util.ResultBean;
+import im.dx.common.util.WebHelper;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.util.StringUtils;
 import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;

src/main/java/im/zhaojun/common/shiro/filter/RestFormAuthenticationFilter.java → src/main/java/im/dx/common/shiro/filter/RestFormAuthenticationFilter.java

-package im.zhaojun.common.shiro.filter;
+package im.dx.common.shiro.filter;
 
-import im.zhaojun.common.util.IPUtils;
-import im.zhaojun.common.util.ResultBean;
-import im.zhaojun.common.util.WebHelper;
+import im.dx.common.util.IPUtils;
+import im.dx.common.util.ResultBean;
+import im.dx.common.util.WebHelper;
 import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
 import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.Logger;

src/main/java/im/zhaojun/common/shiro/realm/OAuth2GiteeRealm.java → src/main/java/im/dx/common/shiro/realm/OAuth2GiteeRealm.java

-package im.zhaojun.common.shiro.realm;
+package im.dx.common.shiro.realm;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
+import im.dx.common.constants.AuthcTypeEnum;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/im/zhaojun/common/shiro/realm/OAuth2GithubRealm.java → src/main/java/im/dx/common/shiro/realm/OAuth2GithubRealm.java

-package im.zhaojun.common.shiro.realm;
+package im.dx.common.shiro.realm;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
+import im.dx.common.constants.AuthcTypeEnum;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/im/zhaojun/common/shiro/realm/OAuth2Realm.java → src/main/java/im/dx/common/shiro/realm/OAuth2Realm.java

-package im.zhaojun.common.shiro.realm;
+package im.dx.common.shiro.realm;
 
 import cn.hutool.core.lang.UUID;
-import im.zhaojun.common.constants.AuthcTypeEnum;
-import im.zhaojun.common.shiro.OAuth2Helper;
-import im.zhaojun.common.shiro.token.OAuth2Token;
-import im.zhaojun.common.util.ShiroUtil;
-import im.zhaojun.common.util.WebHelper;
-import im.zhaojun.system.model.User;
-import im.zhaojun.system.model.UserAuths;
-import im.zhaojun.system.service.UserAuthsService;
-import im.zhaojun.system.service.UserService;
+import im.dx.common.constants.AuthcTypeEnum;
+import im.dx.common.shiro.OAuth2Helper;
+import im.dx.common.shiro.token.OAuth2Token;
+import im.dx.common.util.ShiroUtil;
+import im.dx.common.util.WebHelper;
+import im.dx.system.model.User;
+import im.dx.system.model.UserAuths;
+import im.dx.system.service.UserAuthsService;
+import im.dx.system.service.UserService;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthRequest;

src/main/java/im/zhaojun/common/shiro/realm/UserNameRealm.java → src/main/java/im/dx/common/shiro/realm/UserNameRealm.java

-package im.zhaojun.common.shiro.realm;
+package im.dx.common.shiro.realm;
 
-import im.zhaojun.common.shiro.ShiroActionProperties;
-import im.zhaojun.common.util.ShiroUtil;
-import im.zhaojun.system.model.User;
-import im.zhaojun.system.service.UserService;
+import im.dx.common.shiro.ShiroActionProperties;
+import im.dx.common.util.ShiroUtil;
+import im.dx.system.model.User;
+import im.dx.system.service.UserService;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;

src/main/java/im/zhaojun/common/shiro/token/OAuth2Token.java → src/main/java/im/dx/common/shiro/token/OAuth2Token.java

-package im.zhaojun.common.shiro.token;
+package im.dx.common.shiro.token;
 
-import im.zhaojun.common.constants.AuthcTypeEnum;
+import im.dx.common.constants.AuthcTypeEnum;
 import org.apache.shiro.authc.AuthenticationToken;
 
 public class OAuth2Token implements AuthenticationToken {

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

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import java.lang.management.ManagementFactory;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

src/main/java/im/zhaojun/common/util/ExcelCol.java → src/main/java/im/dx/common/util/ExcelCol.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 
 public class ExcelCol {

src/main/java/im/zhaojun/common/util/ExcelReader.java → src/main/java/im/dx/common/util/ExcelReader.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -11,7 +11,7 @@ import java.text.DecimalFormat;
 
 
 /**
- * 读取Excel
+ * ��ȡExcel
  * @author redhightree
  *
  */
@@ -24,7 +24,7 @@ public class ExcelReader {
     private HSSFRow row = null;
     /* cell,the content which contains */
     private HSSFCell cell = null;
-    /* 第sheetnum个工作表 */
+    /* ��sheetnum�������� */
     private int sheetNum = 0;
     private int rowNum = 0;
     private FileInputStream fis = null;
@@ -46,8 +46,8 @@ public class ExcelReader {
     }
 
     /**
-     * 读取excel文件获得HSSFWorkbook对象
-     * @param fileName 文件名
+     * ��ȡexcel�ļ����HSSFWorkbook����
+     * @param fileName �ļ���
      */
     public void openFile(String fileName) {
         this.fileName = fileName;
@@ -67,7 +67,7 @@ public class ExcelReader {
     }
 
     /**
-     * 返回sheet表数目
+     * ����sheet����Ŀ
      * @return int
      */
     public int getSheetCount() {
@@ -77,7 +77,7 @@ public class ExcelReader {
     }
 
     /**
-     * sheetNum下的记录行数
+     * sheetNum�µļ�¼����
      * @return int
      */
     public int getRowCount() {
@@ -91,7 +91,7 @@ public class ExcelReader {
     }
 
     /**
-     * 读取指定sheetNum的rowCount
+     * ��ȡָ��sheetNum��rowCount
      * @param sheetNum
      * @return int
      */
@@ -103,7 +103,7 @@ public class ExcelReader {
     }
 
     /**
-     * 得到指定行的内容
+     * �õ�ָ���е�����
      * @param lineNum
      * @return String[]
      */
@@ -112,10 +112,10 @@ public class ExcelReader {
     }
 
     /**
-     * 指定工作表和行数的内容
+     * ָ�������������������
      * @param sheetNum
      * @param lineNum
-     * @param colNum    制定的列号  added by wangxiaohui
+     * @param colNum    �ƶ����к�  added by wangxiaohui
      * @return String[]
      */
     public String [] readExcelLine(int sheetNum, int lineNum,int colNum) {
@@ -129,7 +129,7 @@ public class ExcelReader {
             int cellCount = sheet.getRow(sheet.getFirstRowNum()).getLastCellNum();
             strExcelLine = new String[cellCount];
             //for (int i = 0; i < cellCount; i++) {
-            //不做循环，直接读取指定列，提高效率   modified by wangxiaohui
+            //����ѭ����ֱ�Ӷ�ȡָ���У����Ч��   modified by wangxiaohui
             int i=colNum;
             strExcelLine[i] = "";
             if (null != row.getCell((short) i)) {
@@ -150,7 +150,7 @@ public class ExcelReader {
                         strExcelLine[i] = "";
                         break;
                 }
-                //如果读取的是科学计数法的格式，则转换为普通格式
+                //�����ȡ���ǿ�ѧ�������ĸ�ʽ����ת��Ϊ��ͨ��ʽ
                 //added by wangtongjun at 20060626
                 if (null != strExcelLine[i] &&
                         strExcelLine[i].indexOf(".") != -1 &&
@@ -158,7 +158,7 @@ public class ExcelReader {
                     DecimalFormat df = new DecimalFormat();
                     strExcelLine[i] = df.parse(strExcelLine[i]).toString();
                 }
-                //如果读取的是数字格式，并且以".0"结尾格式，则转换为普通格式
+                //�����ȡ�������ָ�ʽ��������".0"��β��ʽ����ת��Ϊ��ͨ��ʽ
                 //added by wangtongjun at 20060713
                 if (null != strExcelLine &&
                         strExcelLine[i].endsWith(".0")) {
@@ -174,7 +174,7 @@ public class ExcelReader {
     }
 
     /**
-     * 读取指定列的内容
+     * ��ȡָ���е�����
      * @param cellNum
      * @return String
      */
@@ -183,7 +183,7 @@ public class ExcelReader {
     }
 
     /**
-     * 指定行和列编号的内容
+     * ָ���к��б�ŵ�����
      * @param rowNum
      * @param cellNum
      * @return String
@@ -193,7 +193,7 @@ public class ExcelReader {
     }
 
     /**
-     * 指定工作表、行、列下的内容
+     * ָ���������С����µ�����
      * @param sheetNum
      * @param rowNum
      * @param cellNum
@@ -225,14 +225,14 @@ public class ExcelReader {
                         break;
                     default :
                 }
-                //如果读取的是科学计数法的格式，则转换为普通格式
+                //�����ȡ���ǿ�ѧ�������ĸ�ʽ����ת��Ϊ��ͨ��ʽ
                 if (null != strExcelCell &&
                         strExcelCell.indexOf(".") != -1 &&
                         strExcelCell.indexOf("E") != -1) {
                     DecimalFormat df = new DecimalFormat();
                     strExcelCell = df.parse(strExcelCell).toString();
                 }
-                //如果读取的是数字格式，并且以".0"结尾格式，则转换为普通格式
+                //�����ȡ�������ָ�ʽ��������".0"��β��ʽ����ת��Ϊ��ͨ��ʽ
                 //added by wangtongjun at 20060713
                 if (null != strExcelCell &&
                         strExcelCell.endsWith(".0")) {
@@ -321,9 +321,9 @@ public class ExcelReader {
     public static void main(String args[]) throws Exception {
         ExcelReader readExcel = new ExcelReader();
         readExcel.openFile("C:\\all.xls");
-        /* 设置读取索引为0的工作表 */
+        /* ���ö�ȡ����Ϊ0�Ĺ����� */
         readExcel.setSheetNum(0);
-        //总行数
+        //������
         int count = readExcel.getRowCount();
         System.out.println(readExcel.readStringExcelCell(1, 5));
         for (int i = 0; i <= count; i++) {

src/main/java/im/zhaojun/common/util/ExportEngine.java → src/main/java/im/dx/common/util/ExportEngine.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/im/zhaojun/common/util/IPUtils.java → src/main/java/im/dx/common/util/IPUtils.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

src/main/java/im/zhaojun/common/util/PageResultBean.java → src/main/java/im/dx/common/util/PageResultBean.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/im/zhaojun/common/util/ResultBean.java → src/main/java/im/dx/common/util/ResultBean.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import java.io.Serializable;
 

src/main/java/im/zhaojun/common/util/ShiroUtil.java → src/main/java/im/dx/common/util/ShiroUtil.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
-import im.zhaojun.system.model.User;
+import im.dx.system.model.User;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthenticatedException;
 import org.springframework.stereotype.Component;

src/main/java/im/zhaojun/common/util/SpringBeanUtils.java → src/main/java/im/dx/common/util/SpringBeanUtils.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;

src/main/java/im/zhaojun/common/util/ThreadPoolUtil.java → src/main/java/im/dx/common/util/ThreadPoolUtil.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import java.util.concurrent.*;
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;

src/main/java/im/zhaojun/common/util/TreeUtil.java → src/main/java/im/dx/common/util/TreeUtil.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
-import im.zhaojun.common.exception.TreeCastException;
+import im.dx.common.exception.TreeCastException;
+import im.dx.system.model.UserRoleTree;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.validation.constraints.NotNull;
 import java.lang.reflect.Field;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class TreeUtil {
 
@@ -101,6 +100,24 @@ public class TreeUtil {
             throw new TreeCastException(e);
         }
     }
+    private static List<UserRoleTree> getChildCategoryList(UserRoleTree menu, List<UserRoleTree> button) {
+        //当前对象的pid==传进来的集合里面的id 根据这个关系去确定是否是子集
+        return button.stream().filter(o -> o.getParentid().equals(menu.getId()))
+                //递归查询
+                .peek(o -> o.setChildren(getChildCategoryList(o, button)))
+                .collect(Collectors.toList());
+    }
+
+
+
+    public static List<UserRoleTree> getTree( List<UserRoleTree> roleInfoVoList) {
+        //用java8新特性 stream的filter对付目录进行过滤获取
+        return roleInfoVoList.stream()
+                .filter(o -> o.getParentid() ==0)
+                .peek(o -> o.setChildren(getChildCategoryList(o, roleInfoVoList)))
+                //返回list集合
+                .collect(Collectors.toList());
+    }
 
     /**
      * 集合转树结构

src/main/java/im/zhaojun/common/util/WebHelper.java → src/main/java/im/dx/common/util/WebHelper.java

-package im.zhaojun.common.util;
+package im.dx.common.util;
 
 import cn.hutool.json.JSONUtil;
 import org.springframework.web.context.request.RequestContextHolder;

src/main/java/im/zhaojun/common/validate/groups/Create.java → src/main/java/im/dx/common/validate/groups/Create.java

-package im.zhaojun.common.validate.groups;
+package im.dx.common.validate.groups;
 
 import javax.validation.groups.Default;
 

src/main/java/im/zhaojun/common/validate/groups/Delete.java → src/main/java/im/dx/common/validate/groups/Delete.java

-package im.zhaojun.common.validate.groups;
+package im.dx.common.validate.groups;
 
 import javax.validation.groups.Default;
 

src/main/java/im/zhaojun/common/validate/groups/Update.java → src/main/java/im/dx/common/validate/groups/Update.java

-package im.zhaojun.common.validate.groups;
+package im.dx.common.validate.groups;
 
 import javax.validation.groups.Default;
 

src/main/java/im/zhaojun/system/mapper/AlarmMapper.java → src/main/java/im/dx/system/mapper/AlarmMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Alarm;
+import im.dx.system.model.Alarm;
 import org.apache.ibatis.annotations.Mapper;
 
 

src/main/java/im/zhaojun/system/mapper/CodeMapper.java → src/main/java/im/dx/system/mapper/CodeMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Code;
-import im.zhaojun.system.model.VideoeRecordType;
+import im.dx.system.model.Code;
+import im.dx.system.model.VideoeRecordType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/DeptMapper.java → src/main/java/im/dx/system/mapper/DeptMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Dept;
-import im.zhaojun.system.model.DeptTree;
-import im.zhaojun.system.model.DeptVideo;
+import im.dx.system.model.Dept;
+import im.dx.system.model.DeptTree;
+import im.dx.system.model.DeptVideo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/DeptTreeMapper.java → src/main/java/im/dx/system/mapper/DeptTreeMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.DeptTree;
-import im.zhaojun.system.model.VideoeRecordType;
+import im.dx.system.model.DeptTree;
+import im.dx.system.model.VideoeRecordType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/LoginLogMapper.java → src/main/java/im/dx/system/mapper/LoginLogMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.LoginLog;
+import im.dx.system.model.LoginLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/MenuMapper.java → src/main/java/im/dx/system/mapper/MenuMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Menu;
+import im.dx.system.model.Menu;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/OperatorMapper.java → src/main/java/im/dx/system/mapper/OperatorMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Operator;
+import im.dx.system.model.Operator;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/RoleMapper.java → src/main/java/im/dx/system/mapper/RoleMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Role;
+import im.dx.system.model.Role;
+import im.dx.system.model.TaskParams;
+import im.dx.system.model.UserRoleTree;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +23,7 @@ public interface RoleMapper {
     List<Role> selectAllByQuery(Role roleQuery);
 
     int count();
+
+    List<UserRoleTree> queryRoleUserTree();
+     int  addtaskinfo(@Param("taskParams") TaskParams taskParams);
 }
\ No newline at end of file

src/main/java/im/zhaojun/system/mapper/RoleOperatorMapper.java → src/main/java/im/dx/system/mapper/RoleOperatorMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.RoleOperator;
+import im.dx.system.model.RoleOperator;
+import im.dx.system.model.UserRoleTree;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface RoleOperatorMapper {
     int insert(RoleOperator roleOperator);
@@ -21,5 +24,4 @@ public interface RoleOperatorMapper {
     int deleterecordtypeByRoleId(@Param("roleId") Integer roleId);
 
 
-
 }
\ No newline at end of file

src/main/java/im/zhaojun/system/mapper/SysLogMapper.java → src/main/java/im/dx/system/mapper/SysLogMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.SysLog;
+import im.dx.system.model.SysLog;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/im/zhaojun/system/mapper/TraffalarmrecordMapper.java → src/main/java/im/dx/system/mapper/TraffalarmrecordMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.DeviceChannelid;
-import im.zhaojun.system.model.Traffalarmrecord;
-import im.zhaojun.system.model.TraffalarmrecordResult;
+import im.dx.system.model.DeviceChannelid;
+import im.dx.system.model.Traffalarmrecord;
+import im.dx.system.model.TraffalarmrecordResult;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.dialect.oracle.InsertListMapper;
 import tk.mybatis.mapper.common.BaseMapper;

src/main/java/im/zhaojun/system/mapper/TraffdevicewriteresultMapper.java → src/main/java/im/dx/system/mapper/TraffdevicewriteresultMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
 
-import im.zhaojun.system.model.SbtdspsrParams;
-import im.zhaojun.system.model.SbtdspsrResult;
-import im.zhaojun.system.model.Traffdevicewriteresult;
+import im.dx.system.model.SbtdspsrParams;
+import im.dx.system.model.SbtdspsrResult;
+import im.dx.system.model.Traffdevicewriteresult;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.dialect.oracle.InsertListMapper;
 import tk.mybatis.mapper.common.BaseMapper;

src/main/java/im/zhaojun/system/mapper/TrafficStatisticsMapper.java → src/main/java/im/dx/system/mapper/TrafficStatisticsMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.*;
+import im.dx.system.model.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,27 +9,6 @@ import java.util.Map;
 
 @Mapper
 public interface TrafficStatisticsMapper {
-    List<Map> selectVehicles(@Param("starttime") String starttime, @Param("endtime") String endtime, @Param("deptId") String deptid);
-
-    List<Map> selectFlowStatus(@Param("starttime") String starttime, @Param("endtime") String endtime, @Param("deptId") String videoid);
-
-    List<Map> selectVehiclesTypes(@Param("starttime") String starttime, @Param("endtime") String endtime, @Param("deptId") String deptid);
-
-    List<Map> selectAlarms(@Param("starttime") String starttime, @Param("endtime") String endtime, @Param("deptId") String deptid);
-
-    List<Map> selectAlarmsTypes(@Param("starttime") String starttime, @Param("endtime") String endtime, @Param("deptId") String deptid);
-
-    List<Map> selectAlarmsByVideoName(@Param("videoname") String videoname, @Param("starttime") String starttime, @Param("endtime") String endtime, @Param("topnum") Integer topnum);
-
-    List<VehiclesStatistic> selectVehiclesByVideoIdAndType(Map map);
-
-    List<VehiclesStatisticResult> selectStatisVehiclesByVideoIdAndType(Map map);
-
-    List<VehiclesStatisticResult> selectVehiclesStatisByVideoIdAndType(Map map);
-
-    List<VehiclesStatisticResult> selectVehiclesByMutiParam(Map map);
-
-    List<Alarm> selectAlarmsByTime(Map map);
 
     Role selectByPrimaryKey(@Param("roleId") Integer roleId);
 
@@ -37,24 +16,17 @@ public interface TrafficStatisticsMapper {
 
     List<Role> selectAll();
 
-    List<Role> selectAllByQuery(Role roleQuery);
 
     int count();
 
     List<CodeData> selectCodeByCodeid(@Param("codeid") String codeid, @Param("level") String level);
 
-    List<Map> selectvideoVehiclesOrAlarms(Map map);
-
 
     List<TraffpictureParam> queryTraffalarmrecordByPage(Map map);
 
     int updateTraffalarmrecordById(@Param(value = "list") List<TraffpictureParam> recordlist);
 
-    List<VehiclesStatisticResult> todayvehiclesByVideoId(Map map);
 
-    List<VehiclesStatisticResult> todayvehiclesByeveryhour(Map map);
-
-    List<RecordResult> todaytraffRecordByeveryhour(Map map);
 
     List<RecordResult> todaytraffRecords(Map map);
 
@@ -68,10 +40,6 @@ public interface TrafficStatisticsMapper {
 
     List<Traffalarmrecordstate> selecteventresultBypage(TraffalarmrecordstatParams params);
 
-    List<TraffalarmrecordResult> selectTraffalarmrecordAllByPage(@Param("recordtype") String recordtype, @Param("areaid") Long areaid, @Param("checkstatus") Integer checkstatus,
-                                                                 @Param("starttime") String starttime, @Param("endtime") String endtime, @Param("pushstatus") Integer pushstatus);
-
-    int updateVideochecktime(@Param(value = "list") List<TraffpictureParam> recordlist);
 
     int  deleteTraffalarmrecordById(String recordid);
 
@@ -84,4 +52,7 @@ public interface TrafficStatisticsMapper {
     List<Face> queryTraffFaceDetail(String id);
 
     List<PeopleRideBicyc> queryTraffPeopleRideBicycDetail(String id);
+
+    int delTraffalarmrecordByIds(@Param(value = "list") List<TraffpictureParam> recordlist);
+    int deltaskinfoByIds(@Param(value = "list") List<TraffpictureParam> recordlist);
 }
\ No newline at end of file

src/main/java/im/zhaojun/system/mapper/UserAuthsMapper.java → src/main/java/im/dx/system/mapper/UserAuthsMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.UserAuths;
+import im.dx.system.model.UserAuths;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/UserMapper.java → src/main/java/im/dx/system/mapper/UserMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.User;
+import im.dx.system.model.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/im/zhaojun/system/mapper/UserRoleMapper.java → src/main/java/im/dx/system/mapper/UserRoleMapper.java

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.UserRole;
+import im.dx.system.model.UserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

-package im.zhaojun.system.mapper;
+package im.dx.system.mapper;
 
-import im.zhaojun.system.model.Sbtdspsr;
-import im.zhaojun.system.model.Video;
+import im.dx.system.model.Sbtdspsr;
+import im.dx.system.model.Video;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,4 +14,5 @@ public interface VideoMapper {
     int insert(Sbtdspsr video);
     void delete(String id);
     void updateByPrimaryKey(Sbtdspsr video);
+    int taskExists(String tsakno);
 }
\ No newline at end of file

src/main/java/im/zhaojun/system/model/Alarm.java → src/main/java/im/dx/system/model/Alarm.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class Alarm {
     private String id;

src/main/java/im/zhaojun/system/model/Car.java → src/main/java/im/dx/system/model/Car.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class Car {
     String  obj_id;

src/main/java/im/zhaojun/system/model/Code.java → src/main/java/im/dx/system/model/Code.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import java.io.Serializable;
 

src/main/java/im/zhaojun/system/model/CodeData.java → src/main/java/im/dx/system/model/CodeData.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
-import java.util.List;
 
 public class CodeData implements Serializable {
 

src/main/java/im/zhaojun/system/model/Dept.java → src/main/java/im/dx/system/model/Dept.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 public class Dept implements Serializable {

src/main/java/im/zhaojun/system/model/DeptTree.java → src/main/java/im/dx/system/model/DeptTree.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/im/zhaojun/system/model/DeptVideo.java → src/main/java/im/dx/system/model/DeptVideo.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/im/zhaojun/system/model/DeviceChannelid.java → src/main/java/im/dx/system/model/DeviceChannelid.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/im/zhaojun/system/model/Face.java → src/main/java/im/dx/system/model/Face.java

-package im.zhaojun.system.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
+package im.dx.system.model;
 
 public class Face {
     private Long id;

src/main/java/im/zhaojun/system/model/FaceBoundingBox.java → src/main/java/im/dx/system/model/FaceBoundingBox.java

 /**
   * Copyright 2021 json.cn 
   */
-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class FaceBoundingBox {
 

src/main/java/im/zhaojun/system/model/HeadBoundingBox.java → src/main/java/im/dx/system/model/HeadBoundingBox.java

 /**
   * Copyright 2021 json.cn 
   */
-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class HeadBoundingBox {
 

src/main/java/im/zhaojun/system/model/LoginLog.java → src/main/java/im/dx/system/model/LoginLog.java

-package im.zhaojun.system.model;
-
-import java.util.Date;
+package im.dx.system.model;
 
 public class LoginLog{
     private Integer id;

src/main/java/im/zhaojun/system/model/LowerBoundingBox.java → src/main/java/im/dx/system/model/LowerBoundingBox.java

 /**
   * Copyright 2021 json.cn 
   */
-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class LowerBoundingBox {
 

src/main/java/im/zhaojun/system/model/Menu.java → src/main/java/im/dx/system/model/Menu.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 public class Menu implements Serializable {

src/main/java/im/zhaojun/system/model/ObjectBoundingBox.java → src/main/java/im/dx/system/model/ObjectBoundingBox.java

 /**
   * Copyright 2021 json.cn 
   */
-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class ObjectBoundingBox {
 

src/main/java/im/zhaojun/system/model/Operator.java → src/main/java/im/dx/system/model/Operator.java

-package im.zhaojun.system.model;
-
-import java.util.Date;
+package im.dx.system.model;
 
 public class Operator {
     /**

src/main/java/im/zhaojun/system/model/PeopleRideBicyc.java → src/main/java/im/dx/system/model/PeopleRideBicyc.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class PeopleRideBicyc {
 

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

+package im.dx.system.model;
+
+public class Point {
+    int x;
+    int y;
+    int w;
+    int h;
+
+    public Point() {
+    }
+
+    public Point(int x, int y, int w, int h) {
+        this.x = x;
+        this.y = y;
+        this.w = w;
+        this.h = h;
+    }
+
+    public Point(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public int getW() {
+        return w;
+    }
+
+    public void setW(int w) {
+        this.w = w;
+    }
+
+    public int getH() {
+        return h;
+    }
+
+    public void setH(int h) {
+        this.h = h;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public void setY(int y) {
+        this.y = y;
+    }
+}

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

+package im.dx.system.model;
+
+public class PointFour {
+    int x;
+    int y;
+
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public void setY(int y) {
+        this.y = y;
+    }
+}

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

+package im.dx.system.model;
+
+import java.io.Serializable;
+
+public class QuartzTaskInformations implements Serializable {
+    private Long id;
+
+    private Integer version;
+
+    private String taskno;
+
+    private String taskname;
+
+    private String schedulerrule;
+
+    private String frozenstatus;
+
+    private String executorno;
+
+    private Long frozentime;
+
+    private Long unfrozentime;
+
+    private Long createtime;
+
+    private Long lastmodifytime;
+
+    private String sendtype;
+
+    private String url;
+
+    private String executeparamter;
+
+    private String timekey;
+    private Long objectx;
+    private Long objecty;
+    private Long objectw;
+    private Long objecth;
+    private String recordtype;
+
+    private String metatype;
+    private String imgsrc;
+
+    private String rtsp;
+    private String  videoid;
+
+    public String getVideoid() {
+        return videoid;
+    }
+
+    public void setVideoid(String videoid) {
+        this.videoid = videoid;
+    }
+
+    public String getImgsrc() {
+        return imgsrc;
+    }
+
+    public void setImgsrc(String imgsrc) {
+        this.imgsrc = imgsrc;
+    }
+
+    public String getRtsp() {
+        return rtsp;
+    }
+
+    public void setRtsp(String rtsp) {
+        this.rtsp = rtsp;
+    }
+
+    public String getMetatype() {
+        return metatype;
+    }
+
+    public void setMetatype(String metatype) {
+        this.metatype = metatype;
+    }
+
+    public Long getObjectx() {
+        return objectx;
+    }
+
+    public void setObjectx(Long objectx) {
+        this.objectx = objectx;
+    }
+
+    public Long getObjecty() {
+        return objecty;
+    }
+
+    public void setObjecty(Long objecty) {
+        this.objecty = objecty;
+    }
+
+    public Long getObjectw() {
+        return objectw;
+    }
+
+    public void setObjectw(Long objectw) {
+        this.objectw = objectw;
+    }
+
+    public Long getObjecth() {
+        return objecth;
+    }
+
+    public void setObjecth(Long objecth) {
+        this.objecth = objecth;
+    }
+
+    public String getRecordtype() {
+        return recordtype;
+    }
+
+    public void setRecordtype(String recordtype) {
+        this.recordtype = recordtype;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public String getTaskno() {
+        return taskno;
+    }
+
+    public void setTaskno(String taskno) {
+        this.taskno = taskno == null ? null : taskno.trim();
+    }
+
+    public String getTaskname() {
+        return taskname;
+    }
+
+    public void setTaskname(String taskname) {
+        this.taskname = taskname == null ? null : taskname.trim();
+    }
+
+    public String getSchedulerrule() {
+        return schedulerrule;
+    }
+
+    public void setSchedulerrule(String schedulerrule) {
+        this.schedulerrule = schedulerrule == null ? null : schedulerrule.trim();
+    }
+
+    public String getFrozenstatus() {
+        return frozenstatus;
+    }
+
+    public void setFrozenstatus(String frozenstatus) {
+        this.frozenstatus = frozenstatus == null ? null : frozenstatus.trim();
+    }
+
+    public String getExecutorno() {
+        return executorno;
+    }
+
+    public void setExecutorno(String executorno) {
+        this.executorno = executorno == null ? null : executorno.trim();
+    }
+
+    public Long getFrozentime() {
+        return frozentime;
+    }
+
+    public void setFrozentime(Long frozentime) {
+        this.frozentime = frozentime;
+    }
+
+    public Long getUnfrozentime() {
+        return unfrozentime;
+    }
+
+    public void setUnfrozentime(Long unfrozentime) {
+        this.unfrozentime = unfrozentime;
+    }
+
+    public Long getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Long createtime) {
+        this.createtime = createtime;
+    }
+
+    public Long getLastmodifytime() {
+        return lastmodifytime;
+    }
+
+    public void setLastmodifytime(Long lastmodifytime) {
+        this.lastmodifytime = lastmodifytime;
+    }
+
+    public String getSendtype() {
+        return sendtype;
+    }
+
+    public void setSendtype(String sendtype) {
+        this.sendtype = sendtype == null ? null : sendtype.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getExecuteparamter() {
+        return executeparamter;
+    }
+
+    public void setExecuteparamter(String executeparamter) {
+        this.executeparamter = executeparamter == null ? null : executeparamter.trim();
+    }
+
+    public String getTimekey() {
+        return timekey;
+    }
+
+    public void setTimekey(String timekey) {
+        this.timekey = timekey == null ? null : timekey.trim();
+    }
+}

src/main/java/im/zhaojun/system/model/RecordResult.java → src/main/java/im/dx/system/model/RecordResult.java

-package im.zhaojun.system.model;
-
-import lombok.Data;
+package im.dx.system.model;
 
 public class RecordResult {
     private String total;

src/main/java/im/zhaojun/system/model/ResponseEnum.java → src/main/java/im/dx/system/model/ResponseEnum.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 
 import lombok.Getter;

src/main/java/im/zhaojun/system/model/Role.java → src/main/java/im/dx/system/model/Role.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class Role implements Serializable {
 

src/main/java/im/zhaojun/system/model/RoleMenu.java → src/main/java/im/dx/system/model/RoleMenu.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class RoleMenu {
     private Integer roleId;

src/main/java/im/zhaojun/system/model/RoleOperator.java → src/main/java/im/dx/system/model/RoleOperator.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class RoleOperator {
     private Integer roleId;

src/main/java/im/zhaojun/system/model/SafetyBelt.java → src/main/java/im/dx/system/model/SafetyBelt.java

 /**
   * Copyright 2021 json.cn 
   */
-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 public class SafetyBelt {
 

src/main/java/im/zhaojun/system/model/Sbtdspsr.java → src/main/java/im/dx/system/model/Sbtdspsr.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import javax.persistence.Column;
 import java.io.Serializable;

src/main/java/im/zhaojun/system/model/SbtdspsrParams.java → src/main/java/im/dx/system/model/SbtdspsrParams.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -9,38 +9,38 @@ import java.util.Date;
 @Setter
 public class SbtdspsrParams extends Sbtdspsr {
     /**
-     * 创建时间
+     * ����ʱ��
      */
     private Date createtime;
 
     /**
-     * 推送状态(0成功1失败)
+     * ����״̬(0�ɹ�1ʧ��)
      */
     private Long pushstatus;
 
     /**
-     * 推送描述
+     * ��������
      */
     private String pushdesc;
 
 
     /**
-     * 推送次数
+     * ���ʹ���
      */
     private Long pushcount;
 
     /**
-     * 行政编号
+     * �������
      */
     private String xzbh;
 
     /**
-     * 备注
+     * ��ע
      */
     private String remark;
 
     /**
-     * 行政名称
+     * ��������
      */
     private String xztreename;
 

src/main/java/im/zhaojun/system/model/SbtdspsrResult.java → src/main/java/im/dx/system/model/SbtdspsrResult.java

-package im.zhaojun.system.model;
+package im.dx.system.model;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -9,38 +9,38 @@ import java.util.Date;
 @Setter
 public class SbtdspsrResult extends Sbtdspsr {
     /**
-     * 创建时间
+     * ����ʱ��
      */
     private Date createtime;
 
     /**
-     * 推送状态(0成功1失败)
+     * ����״̬(0�ɹ�1ʧ��)
      */
     private Long pushstatus;
 
     /**
-     * 推送描述
+     * ��������
      */
     private String pushdesc;
 
 
     /**
-     * 推送次数
+     * ���ʹ���
      */
     private Long pushcount;
 
     /**
-     * 行政编号
+     * �������
      */
     private String xzbh;
 
     /**
-     * 备注
+     * ��ע
      */
     private String remark;
 
     /**
-     * 行政名称
+     * ��������
      */
     private String xztreename;
 

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

+package im.dx.system.model;
+
+import java.util.List;
+
+public class TaskParams {
+    private List<String> traffid;
+    private String userid;
+
+    public List<String> getTraffid() {
+        return traffid;
+    }
+
+    public void setTraffid(List<String> traffid) {
+        this.traffid = traffid;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+}

src/main/java/im/zhaojun/system/model/ResultObj.java → src/main/java/im/dx/system/model/TaskResultObj.java

-package im.zhaojun.system.model;
 
+package im.dx.system.model;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
-/**
- * 自定义响应结构
- * @author  cp
- */
-@Getter
-@Setter
-public class ResultObj {
-
-    // 定义jackson对象
+public class TaskResultObj {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     /**
-     * 响应业务状态
-     * 200	成功
-     * 201	错误
-     * 400	参数错误
+     * 响应业务状态
+     * 200	成功
+     * 201	错误
+     * 400	参数错误
      */
-    private Integer status;
+    private String errorCode;
 
     /**
-     * 响应消息
+     * 响应消息
      */
-    private String msg;
+    private String errorMsg;
 
     /**
-     * 响应中的数据
+     * 响应中的数据
      */
     private Object data;
 
-    public static ResultObj error(Integer status, String msg, Object data) {
-        return new ResultObj(status, msg, data);
+    public static TaskResultObj error(String status, String msg, Object data) {
+        return new TaskResultObj(status, msg, data);
     }
 
-    public static ResultObj ok(Object data) {
-        return new ResultObj(data);
+    public static TaskResultObj ok(Object data) {
+        return new TaskResultObj(data);
     }
 
-    public static ResultObj ok() {
+    public static TaskResultObj ok() {
         return ok(null);
     }
 
-    private ResultObj() {
+    private TaskResultObj() {
 
     }
 
-    public static ResultObj error(Integer status, String msg) {
-        return new ResultObj(status, msg, null);
+    public static TaskResultObj error(String status, String msg) {
+        return new TaskResultObj(status, msg, null);
     }
 
-    private ResultObj(Integer status, String msg, Object data) {
-        this.status = status;
-        this.msg = msg;
+    private TaskResultObj(String status, String msg, Object data) {
+        this.errorCode = status;
+        this.errorMsg = msg;
         this.data = data;
     }
 
-    private ResultObj(Object data) {
-        this.status = 200;
-        this.msg = "OK";
+    private TaskResultObj(Object data) {
+        this.errorCode = "0";
+        this.errorMsg = "success";
         this.data = data;
     }
 
-
     /**
-     * 将json结果集转化为SysResult对象
+     * 将json结果集转化为SysResult对象
      *
-     * @param jsonData json数据
-     * @param clazz SysResult中的object类型
-     * @return SysResult对象
+     * @param jsonData json数据
+     * @param clazz SysResult中的object类型
+     * @return SysResult对象
      */
-    public static ResultObj formatToPojo(String jsonData, Class<?> clazz) {
+    public static TaskResultObj formatToPojo(String jsonData, Class<?> clazz) {
         try {
             if (clazz == null) {
-                return MAPPER.readValue(jsonData, ResultObj.class);
+                return MAPPER.readValue(jsonData, TaskResultObj.class);
             }
             JsonNode jsonNode = MAPPER.readTree(jsonData);
             JsonNode data = jsonNode.get("data");
@@ -89,7 +78,7 @@ public class ResultObj {
             } else if (data.isTextual()) {
                 obj = MAPPER.readValue(data.asText(), clazz);
             }
-            return error(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+            return error(jsonNode.get("errorCode").toString(), jsonNode.get("errorMsg").asText(), obj);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -97,14 +86,14 @@ public class ResultObj {
     }
 
     /**
-     * 没有object对象的转化
+     * 没有object对象的转化
      *
-     * @param json 字符串
-     * @return SysResult对象
+     * @param json 字符串
+     * @return SysResult对象
      */
-    public static ResultObj format(String json) {
+    public static TaskResultObj format(String json) {
         try {
-            return MAPPER.readValue(json, ResultObj.class);
+            return MAPPER.readValue(json, TaskResultObj.class);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -112,13 +101,13 @@ public class ResultObj {
     }
 
     /**
-     * Object是集合转化
+     * Object是集合转化
      *
-     * @param jsonData json数据
-     * @param clazz 集合中的类型
-     * @return SysResult对象
+     * @param jsonData json数据
+     * @param clazz 集合中的类型
+     * @return SysResult对象
      */
-    public static ResultObj formatToList(String jsonData, Class<?> clazz) {
+    public static TaskResultObj formatToList(String jsonData, Class<?> clazz) {
         try {
             JsonNode jsonNode = MAPPER.readTree(jsonData);
             JsonNode data = jsonNode.get("data");
@@ -127,20 +116,34 @@ public class ResultObj {
                 obj = MAPPER.readValue(data.traverse(),
                         MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
             }
-            return error(jsonNode.get("status").intValue(), jsonNode.get("msg").asText(), obj);
+            return error(jsonNode.get("errorCode").toString(), jsonNode.get("errorMsg").asText(), obj);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
     }
 
-    @Override
-    public String toString() {
-        return "ResultObj{" +
-                "status=" + status +
-                ", msg='" + msg + '\'' +
-                ", data=" + data +
-                '}';
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
     }
 
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
 }
\ No newline at end of file