目录修改

modules/common/pom.xml

@@ -3,7 +3,7 @@
          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>com.zhehekeji</groupId>
+    <groupId>com.leaper</groupId>
     <artifactId>common</artifactId>
     <version>1.0.0</version>
 

modules/common/src/main/java/com/leaper/common/CommonConfigure.java

@@ -1,8 +1,8 @@
-package com.zhehekeji.common;
+package com.leaper.common;
 
-import com.zhehekeji.common.properities.Md5Properity;
-import com.zhehekeji.common.properities.RedisProperity;
-import com.zhehekeji.common.util.MD5Util;
+import com.leaper.common.properities.Md5Properity;
+import com.leaper.common.properities.RedisProperity;
+import com.leaper.common.util.MD5Util;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

modules/common/src/main/java/com/leaper/common/constant/CommonConstant.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.constant;
+package com.leaper.common.constant;
 
 public abstract class CommonConstant {
 

modules/common/src/main/java/com/leaper/common/properities/Md5Properity.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.properities;
+package com.leaper.common.properities;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

modules/common/src/main/java/com/leaper/common/properities/Properity.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.properities;
+package com.leaper.common.properities;
 
 import lombok.Getter;
 import lombok.Setter;

modules/common/src/main/java/com/leaper/common/properities/RedisProperity.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.properities;
+package com.leaper.common.properities;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

modules/common/src/main/java/com/leaper/common/util/FileUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 

modules/common/src/main/java/com/leaper/common/util/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import com.zhehekeji.core.util.Assert;
 import lombok.extern.slf4j.Slf4j;

modules/common/src/main/java/com/leaper/common/util/MD5Util.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
-import com.zhehekeji.common.properities.Md5Properity;
+import com.leaper.common.properities.Md5Properity;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

modules/common/src/main/java/com/leaper/common/util/PathUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 

modules/common/src/main/java/com/leaper/common/util/QrUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;

modules/common/src/main/java/com/leaper/common/util/SpringContextUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

modules/common/src/main/java/com/leaper/common/util/Tools.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import java.util.List;
 import java.util.Map;

modules/common/src/main/java/com/leaper/common/util/ValidatorUtil.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.common.util;
+package com.leaper.common.util;
 
 import com.zhehekeji.core.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;

modules/filter/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>modules</artifactId>
-        <groupId>com.zhehekeji</groupId>
+        <groupId>com.leaper</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.zhehekeji</groupId>
+    <groupId>com.leaper</groupId>
     <version>1.0.0</version>
     <artifactId>filter</artifactId>
 
@@ -65,7 +65,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.zhehekeji</groupId>
+            <groupId>com.leaper</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0</version>
             <scope>compile</scope>

modules/filter/src/main/java/com/leaper/filter/FilterConstance.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.filter;
+package com.leaper.filter;
 
 public interface FilterConstance {
 

modules/filter/src/main/java/com/leaper/filter/aspect/SessionAspect.java

@@ -1,22 +1,19 @@
-package com.zhehekeji.filter.aspect;
+package com.leaper.filter.aspect;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zhehekeji.common.util.HttpUtil;
+import com.leaper.common.util.HttpUtil;
+import com.leaper.filter.FilterConstance;
 import com.zhehekeji.core.pojo.HttpStatus;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.filter.FilterConstance;
-import com.zhehekeji.filter.pojo.CurrentUser;
-import com.zhehekeji.filter.pojo.SessionHandler;
-import com.zhehekeji.filter.pojo.UserType;
-import com.zhehekeji.filter.util.CurrentUserUtil;
-import com.zhehekeji.filter.util.JwtUtil;
+import com.leaper.filter.pojo.CurrentUser;
+import com.leaper.filter.pojo.SessionHandler;
+import com.leaper.filter.util.CurrentUserUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -39,12 +36,12 @@ public class SessionAspect {
     private String userUrl;
 
     /**
-     * zhehekeji..*.controller
-     * 匹配zhehekeji 到controller多级目录
+     * leaper..*.controller
+     * leaper 到controller多级目录
      *
      * @param sessionHandler
      */
-    @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)")
+    @Before("execution(public * com.leaper..*.controller.*.*(..))&&@annotation(sessionHandler)")
     public void handler(SessionHandler sessionHandler){
         if(!enable){
             return;

modules/filter/src/main/java/com/leaper/filter/pojo/CurrentUser.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.filter.pojo;
+package com.leaper.filter.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

modules/filter/src/main/java/com/leaper/filter/pojo/SessionHandler.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.filter.pojo;
+package com.leaper.filter.pojo;
 
 import java.lang.annotation.*;
 

modules/filter/src/main/java/com/leaper/filter/pojo/UserType.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.filter.pojo;
+package com.leaper.filter.pojo;
 
 /**
  * @Description 用户分类

modules/filter/src/main/java/com/leaper/filter/util/CurrentUserUtil.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.filter.util;
+package com.leaper.filter.util;
 
-import com.zhehekeji.filter.pojo.CurrentUser;
+import com.leaper.filter.pojo.CurrentUser;
 
 /**
  * @Description 当前操作人线程

modules/filter/src/main/java/com/leaper/filter/util/JwtUtil.java

@@ -1,8 +1,8 @@
-package com.zhehekeji.filter.util;
+package com.leaper.filter.util;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zhehekeji.filter.FilterConstance;
-import com.zhehekeji.filter.pojo.CurrentUser;
+import com.leaper.filter.FilterConstance;
+import com.leaper.filter.pojo.CurrentUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;

modules/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>springbootstart</artifactId>
-        <groupId>com.zhehekeji</groupId>
+        <groupId>com.leaper</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -15,14 +15,14 @@
     <properties>
         <java.version>1.8</java.version>
         <common.version>1.0.0</common.version>
-        <base.assembly.version>1.0.0</base.assembly.version>
+
         <filter.version>1.0.0</filter.version>
     </properties>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.zhehekeji</groupId>
+            <groupId>com.leaper</groupId>
             <artifactId>common</artifactId>
             <version>${common.version}</version>
         </dependency>

pom.xml

@@ -15,11 +15,11 @@
         <version>2.3.1.RELEASE</version>
         <relativePath/>
     </parent>
-    <groupId>com.zhehekeji</groupId>
+    <groupId>com.leaper</groupId>
     <artifactId>springbootstart</artifactId>
     <version>1.0.0</version>
     <name>duoji</name>
-    <description>Demo project for Spring Boot</description>
+    <description>堆垛机随行监控系统</description>
 
     <properties>
         <java.version>1.8</java.version>

readme.md

@@ -1,8 +1,8 @@
 # 舵机
 ## 通讯协议：
-![image](plc通讯协议1.jpg)
-![image](plc通讯协议2.jpg)
+### 昆船通訊協議见doc文件夹，每个项目的协议会略有差异，但是格式不会变
 ### tcp通讯用的netty
+### 昆船通讯协议编解码在web
 #### 1.HeartNettyClient*类是维持与plc的心跳
 #### 2.解码：MyProtocolDecode 这里收到plc的包解析处理，见通讯协议的两张图片
 #### 3.调用sdk拍照，录像，转动球机等操作在com.zhehekeji.web.lib里面

web/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>springbootstart</artifactId>
-        <groupId>com.zhehekeji</groupId>
+        <groupId>com.leaper</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.zhehekeji</groupId>
+            <groupId>com.leaper</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0</version>
         </dependency>
@@ -49,7 +49,7 @@
             <version>4.1.50.Final</version>
         </dependency>
         <dependency>
-            <groupId>com.zhehekeji</groupId>
+            <groupId>com.leaper</groupId>
             <artifactId>filter</artifactId>
             <version>1.0.0</version>
         </dependency>

web/src/main/java/com/leaper/web/Application.java

@@ -1,12 +1,11 @@
-package com.zhehekeji.web;
+package com.leaper.web;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
 
-@SpringBootApplication(scanBasePackages = {"com.zhehekeji"})
-@MapperScan("com.zhehekeji.**.mapper.**")
+@SpringBootApplication(scanBasePackages = {"com.leaper"})
+@MapperScan("com.leaper.**.mapper.**")
 public class Application {
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(Application.class);

web/src/main/java/com/leaper/web/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.config;
+package com.leaper.web.config;
 
 import com.github.pagehelper.cache.GuavaCache;
 import com.google.common.cache.CacheBuilder;

web/src/main/java/com/leaper/web/config/ConfigProperties.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.config;
+package com.leaper.web.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

web/src/main/java/com/leaper/web/config/PackagesSqlSessionFactory.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.config;
+package com.leaper.web.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.SqlSessionFactoryBean;

web/src/main/java/com/leaper/web/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.config;
+package com.leaper.web.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,7 +22,7 @@ public class SwaggerConfig {
                 .apiInfo(apiInfo())
                 .select()
                 //指定提供接口所在的基包
-                .apis(RequestHandlerSelectors.basePackage("com.zhehekeji"))
+                .apis(RequestHandlerSelectors.basePackage("com.leaper"))
                 .build();
     }
 

web/src/main/java/com/leaper/web/controller/AppCenterController.java

@@ -1,10 +1,10 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zhehekeji.common.util.HttpUtil;
+import com.leaper.common.util.HttpUtil;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.pojo.IndexVO;
+import com.leaper.web.pojo.IndexVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

web/src/main/java/com/leaper/web/controller/CameraControlController.java

@@ -1,16 +1,18 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
-import com.zhehekeji.common.util.PathUtil;
+import com.leaper.web.lib.CameraConnMap;
+import com.leaper.web.lib.CameraControlLoginModule;
+import com.leaper.web.lib.CameraControlModule;
+import com.leaper.web.lib.TaskDelayExecutor;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.config.ConfigProperties;
-import com.zhehekeji.web.entity.Camera;
-import com.zhehekeji.web.lib.*;
-import com.zhehekeji.web.lib.hik.HCNetSDK;
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
-import com.zhehekeji.web.mapper.CameraMapper;
-import com.zhehekeji.web.service.CameraService;
-import com.zhehekeji.web.service.PlcService;
+import com.leaper.web.config.ConfigProperties;
+import com.leaper.web.entity.Camera;
+import com.leaper.web.lib.*;
+import com.leaper.web.lib.joyware.NetSDKLib;
+import com.leaper.web.mapper.CameraMapper;
+import com.leaper.web.service.CameraService;
+import com.leaper.web.service.PlcService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

web/src/main/java/com/leaper/web/controller/CameraController.java

@@ -1,22 +1,21 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonParser;
 import com.github.pagehelper.PageInfo;
 import com.sun.jna.ptr.IntByReference;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.entity.Camera;
-import com.zhehekeji.web.entity.CameraIO;
-import com.zhehekeji.web.entity.CameraIOConfig;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.CameraControlModule;
-import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl;
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
-import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq;
-import com.zhehekeji.web.pojo.camera.CameraIOPtz;
-import com.zhehekeji.web.pojo.street.StreetSearch;
-import com.zhehekeji.web.service.CameraService;
+import com.leaper.web.entity.Camera;
+import com.leaper.web.entity.CameraIO;
+import com.leaper.web.entity.CameraIOConfig;
+import com.leaper.web.lib.CameraConnMap;
+import com.leaper.web.lib.CameraControlModule;
+import com.leaper.web.lib.joyware.JoywareLoginModuleImpl;
+import com.leaper.web.lib.joyware.NetSDKLib;
+import com.leaper.web.pojo.camera.CameraConfigSearchReq;
+import com.leaper.web.pojo.camera.CameraIOPtz;
+import com.leaper.web.pojo.street.StreetSearch;
+import com.leaper.web.service.CameraService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +26,6 @@ import javax.annotation.Resource;
 import java.io.*;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 @Api(value = "camera",tags = "球机管理")

web/src/main/java/com/leaper/web/controller/CategoryController.java

@@ -1,10 +1,10 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.entity.Category;
-import com.zhehekeji.web.pojo.category.PageSearch;
-import com.zhehekeji.web.service.CategoryService;
+import com.leaper.web.entity.Category;
+import com.leaper.web.pojo.category.PageSearch;
+import com.leaper.web.service.CategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.core.io.ClassPathResource;

web/src/main/java/com/leaper/web/controller/CheckLogController.java

@@ -1,14 +1,11 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.web.pojo.stock.CheckLogSearch;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.entity.CheckLog;
-import com.zhehekeji.web.entity.StockLog;
-import com.zhehekeji.web.pojo.stock.CheckLogSearch;
-import com.zhehekeji.web.pojo.stock.StockLogSearch;
-import com.zhehekeji.web.service.CheckLogService;
-import com.zhehekeji.web.service.StockLogService;
+import com.leaper.web.entity.CheckLog;
+import com.leaper.web.service.CheckLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;

web/src/main/java/com/leaper/web/controller/Login.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import lombok.Data;
 

web/src/main/java/com/leaper/web/controller/OrderController.java

@@ -1,14 +1,14 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.pojo.OrderSaveReq;
-import com.zhehekeji.web.pojo.OrderSearch;
-import com.zhehekeji.web.pojo.OrderVO;
-import com.zhehekeji.web.service.OrderService;
-import com.zhehekeji.web.service.PlcCmdInfo;
-import com.zhehekeji.web.service.PlcService;
+import com.leaper.web.pojo.OrderSaveReq;
+import com.leaper.web.pojo.OrderSearch;
+import com.leaper.web.pojo.OrderVO;
+import com.leaper.web.service.OrderService;
+import com.leaper.web.service.PlcCmdInfo;
+import com.leaper.web.service.PlcService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

web/src/main/java/com/leaper/web/controller/PLCController.java

@@ -1,13 +1,17 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
+import com.leaper.web.service.GoodsActionTimes;
+import com.leaper.web.service.PlcService;
+import com.leaper.web.service.StreetConn;
+import com.leaper.web.service.StreetService;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.config.ConfigProperties;
-import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.mapper.StreetMapper;
-import com.zhehekeji.web.service.*;
-import com.zhehekeji.web.service.ksec.KsecNettyClient;
-import com.zhehekeji.web.service.robotic.NettyClient;
+import com.leaper.web.config.ConfigProperties;
+import com.leaper.web.entity.Street;
+import com.leaper.web.mapper.StreetMapper;
+import com.leaper.web.service.*;
+import com.leaper.web.service.ksec.KsecNettyClient;
+import com.leaper.web.service.robotic.NettyClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

web/src/main/java/com/leaper/web/controller/RealTimeController.java

@@ -1,11 +1,11 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.config.ConfigProperties;
-import com.zhehekeji.web.entity.Camera;
-import com.zhehekeji.web.pojo.realTime.RealTime;
-import com.zhehekeji.web.service.CameraService;
-import com.zhehekeji.web.service.RealTimeService;
+import com.leaper.web.config.ConfigProperties;
+import com.leaper.web.entity.Camera;
+import com.leaper.web.pojo.realTime.RealTime;
+import com.leaper.web.service.CameraService;
+import com.leaper.web.service.RealTimeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

web/src/main/java/com/leaper/web/controller/SensorController.java

@@ -1,21 +1,14 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.zhehekeji.common.util.HttpUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.pojo.IndexVO;
-import com.zhehekeji.web.service.sick.SickConnMap;
+import com.leaper.web.service.sick.SickConnMap;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.IOException;
-
 @Api( tags = "传感器")
 @RequestMapping(value = "/sensor")
 @RestController()

web/src/main/java/com/leaper/web/controller/StockController.java

@@ -1,13 +1,14 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.github.pagehelper.PageInfo;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.web.pojo.stock.*;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.entity.Stock;
-import com.zhehekeji.web.pojo.category.PageSearch;
-import com.zhehekeji.web.pojo.stock.*;
-import com.zhehekeji.web.service.StockService;
+import com.leaper.web.entity.Stock;
+import com.leaper.web.pojo.category.PageSearch;
+import com.leaper.web.pojo.stock.*;
+import com.leaper.web.service.StockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +24,6 @@ import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.Map;
 
 @Api(value = "Stock", tags = "库存管理")
 @RestController

web/src/main/java/com/leaper/web/controller/StockLogController.java

@@ -1,11 +1,11 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.web.service.StockLogService;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.entity.StockLog;
-import com.zhehekeji.web.pojo.stock.StockLogSearch;
-import com.zhehekeji.web.service.StockLogService;
+import com.leaper.web.entity.StockLog;
+import com.leaper.web.pojo.stock.StockLogSearch;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

web/src/main/java/com/leaper/web/controller/StreetController.java

@@ -1,18 +1,18 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.leaper.web.entity.LightSource;
+import com.leaper.web.service.LightSourceService;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.config.ConfigProperties;
-import com.zhehekeji.web.entity.LightSource;
-import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.pojo.street.StreetSearch;
-import com.zhehekeji.web.pojo.street.StreetVO;
-import com.zhehekeji.web.service.LightSourceService;
-import com.zhehekeji.web.service.StreetService;
-import com.zhehekeji.web.service.damLightSource.JYDAMEquip;
-import com.zhehekeji.web.service.damLightSource.JYDamHelper;
-import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
+import com.leaper.web.config.ConfigProperties;
+import com.leaper.web.entity.Street;
+import com.leaper.web.pojo.street.StreetSearch;
+import com.leaper.web.pojo.street.StreetVO;
+import com.leaper.web.service.StreetService;
+import com.leaper.web.service.damLightSource.JYDAMEquip;
+import com.leaper.web.service.damLightSource.JYDamHelper;
+import com.leaper.web.service.hikLightSource.HikControlSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 @Api(value = "StreetController",tags = "巷道管理")
 @RestController(value = "StreetController")

web/src/main/java/com/leaper/web/controller/TestController.java

@@ -1,7 +1,7 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.service.TestService;
+import com.leaper.web.service.TestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

web/src/main/java/com/leaper/web/controller/WarnController.java

@@ -1,11 +1,11 @@
-package com.zhehekeji.web.controller;
+package com.leaper.web.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.zhehekeji.common.util.ValidatorUtil;
+import com.leaper.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
-import com.zhehekeji.web.pojo.warn.WarnSearch;
-import com.zhehekeji.web.pojo.warn.WarnVO;
-import com.zhehekeji.web.service.WarnService;
+import com.leaper.web.pojo.warn.WarnSearch;
+import com.leaper.web.pojo.warn.WarnVO;
+import com.leaper.web.service.WarnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

web/src/main/java/com/leaper/web/entity/Camera.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/CameraIO.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/CameraIOConfig.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/Category.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/CheckLog.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/LightSource.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/Order.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/RFID.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/SensorGun.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/Stock.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/StockLog.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/entity/Street.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

web/src/main/java/com/leaper/web/entity/StreetShelve.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

web/src/main/java/com/leaper/web/entity/Warn.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.entity;
+package com.leaper.web.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

web/src/main/java/com/leaper/web/lib/CameraConnMap.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.joyware.NetSDKLib;
 
 import java.util.HashMap;
 import java.util.Map;

web/src/main/java/com/leaper/web/lib/CameraControlLoginModule.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.joyware.NetSDKLib;
 
 public interface CameraControlLoginModule {
 

web/src/main/java/com/leaper/web/lib/CameraControlModule.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
 import java.time.LocalDateTime;
 

web/src/main/java/com/leaper/web/lib/CameraDelayTask.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

web/src/main/java/com/leaper/web/lib/OrderInfo.java

@@ -1,7 +1,7 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
-import com.zhehekeji.web.entity.Street;
-import com.zhehekeji.web.service.PlcCmdInfo;
+import com.leaper.web.entity.Street;
+import com.leaper.web.service.PlcCmdInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;

web/src/main/java/com/leaper/web/lib/OrderRealtime.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

web/src/main/java/com/leaper/web/lib/TaskDelayExecutor.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.web.lib;
+package com.leaper.web.lib;
 
-import com.zhehekeji.common.util.SpringContextUtil;
+import com.leaper.common.util.SpringContextUtil;
 
 import java.time.LocalDateTime;
 import java.util.concurrent.DelayQueue;

web/src/main/java/com/leaper/web/lib/hik/HCNetSDK.java

@@ -9,7 +9,7 @@
  * Created on 2009-9-14, 19:31:34
  */
 
-package com.zhehekeji.web.lib.hik;
+package com.leaper.web.lib.hik;
 
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;

web/src/main/java/com/leaper/web/lib/hik/HikCameraControlModuleImpl.java

@@ -1,19 +1,15 @@
-package com.zhehekeji.web.lib.hik;
+package com.leaper.web.lib.hik;
 
-import com.sun.jna.NativeLong;
+import com.leaper.web.lib.CameraConnMap;
+import com.leaper.web.lib.joyware.NetSDKLib;
 import com.sun.jna.ptr.IntByReference;
-import com.zhehekeji.common.util.PathUtil;
+import com.leaper.common.util.PathUtil;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.CameraControlModule;
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.CameraControlModule;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;

web/src/main/java/com/leaper/web/lib/hik/HikExceptionCallBack.java

@@ -1,8 +1,8 @@
-package com.zhehekeji.web.lib.hik;
+package com.leaper.web.lib.hik;
 
 import com.sun.jna.Pointer;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.CameraConnMap;
+import com.leaper.web.lib.joyware.NetSDKLib;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

web/src/main/java/com/leaper/web/lib/hik/HikLoginModuleImpl.java

@@ -1,8 +1,8 @@
-package com.zhehekeji.web.lib.hik;
+package com.leaper.web.lib.hik;
 
+import com.leaper.web.lib.joyware.NetSDKLib;
 import com.sun.jna.Pointer;
-import com.zhehekeji.web.lib.CameraControlLoginModule;
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.CameraControlLoginModule;
 import lombok.extern.slf4j.Slf4j;
 
 /**

web/src/main/java/com/leaper/web/lib/joyware/CallBack.java

@@ -1,7 +1,7 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
+import com.leaper.web.lib.CameraConnMap;
 import com.sun.jna.Pointer;
-import com.zhehekeji.web.lib.CameraConnMap;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

web/src/main/java/com/leaper/web/lib/joyware/CaptureCmdSerial.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;

web/src/main/java/com/leaper/web/lib/joyware/CaptureReceiveCB.java

@@ -1,7 +1,7 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 import com.sun.jna.Pointer;
-import com.zhehekeji.common.util.PathUtil;
+import com.leaper.common.util.PathUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;

web/src/main/java/com/leaper/web/lib/joyware/JoywareCameraControlModuleImpl.java

@@ -1,15 +1,15 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
+import com.leaper.web.lib.CameraConnMap;
 import com.sun.jna.ptr.IntByReference;
-import com.zhehekeji.common.util.PathUtil;
+import com.leaper.common.util.PathUtil;
 import com.zhehekeji.core.util.Assert;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.CameraControlModule;
+import com.leaper.web.lib.CameraControlModule;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
 
-import static com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB;
+import static com.leaper.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB;
 
 /**
  * 云台控制接口实现

web/src/main/java/com/leaper/web/lib/joyware/JoywareLoginModuleImpl.java

@@ -1,15 +1,11 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 import com.sun.jna.CallbackThreadInitializer;
 import com.sun.jna.Memory;
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
-import com.zhehekeji.web.lib.CameraConnMap;
-import com.zhehekeji.web.lib.CameraControlLoginModule;
-import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong;
-import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY;
-import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY;
+import com.leaper.web.lib.CameraControlLoginModule;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -38,7 +34,7 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule {
 
 	public static CallBack.Mp4ReceiveCB mp4ReceiveCB= new CallBack.Mp4ReceiveCB();
 
-	public static Boolean connectStatus(LLong userId){
+	public static Boolean connectStatus(NetSDKLib.LLong userId){
 		IntByReference retLen = new IntByReference(0);
 		Pointer p = new Memory(Integer.SIZE);
 		p.clear(Integer.SIZE);
@@ -117,20 +113,20 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule {
 	 * 登录设备
 	 * \endif
 	 */
-	public LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
+	public NetSDKLib.LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
 		//IntByReference nError = new IntByReference(0);
 		//入参
 		init(disConnectCallBack,haveReConnect);
-		NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY pstInParam=new NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY();
+		NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY pstInParam=new NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY();
 		pstInParam.nPort=m_nPort;
 		pstInParam.szIP=m_strIp.getBytes();
 		pstInParam.szPassword=m_strPassword.getBytes();
 		pstInParam.szUserName=m_strUser.getBytes();
 		//出参
-		NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam=new NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY();
+		NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam=new NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY();
 		pstOutParam.stuDeviceInfo=m_stDeviceInfo;
 		//m_hLoginHandle = netsdk.CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword, 0, null, m_stDeviceInfo, nError);
-		LLong m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam);
+		NetSDKLib.LLong m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam);
 		int tryTimes = 0;
 		while (m_hLoginHandle.longValue()==0 && tryTimes <= MAX_RECONNET_TIME){
 			log.error("joyware login error,ip:{},port:{},errorCode:{}",m_strIp,m_nPort,netsdk.CLIENT_GetLastError());

web/src/main/java/com/leaper/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 /**
  * @author 251823
  * @description 订阅云台元数据接口输输出参数

web/src/main/java/com/leaper/web/lib/joyware/NetSDKLib.java

@@ -1,6 +1,9 @@
-package com.zhehekeji.web.lib.joyware;
-import com.zhehekeji.web.lib.joyware.enumeration.EM_FILTER_IMAGE_TYPE;
-import com.zhehekeji.web.lib.joyware.structure.*;
+package com.leaper.web.lib.joyware;
+import com.leaper.web.lib.joyware.enumeration.EM_FILTER_IMAGE_TYPE;
+import com.leaper.web.lib.joyware.structure.*;
+import com.leaper.web.lib.joyware.structure.NET_IN_PTZ_STATUS_PROC;
+import com.leaper.web.lib.joyware.structure.NET_OUT_PTZ_STATUS_PROC;
+import com.leaper.web.lib.joyware.structure.*;
 import com.sun.jna.*;
 import com.sun.jna.ptr.IntByReference;
 import java.lang.reflect.Field;
@@ -2201,7 +2204,7 @@ public interface NetSDKLib extends Library {
         public NET_EULER_ANGLE             stuFaceCaptureAngle;                // 人脸在抓拍图片中的角度信息, nPitch:抬头低头的俯仰角, nYaw左右转头的偏航角, nRoll头在平面内左偏右偏的翻滚角
         // 角度值取值范围[-90,90], 三个角度值都为999表示此角度信息无效
         public int                        nFaceQuality;                       // 人脸抓拍质量分数
-        public NET_FACEDETECT_IMAGE_INFO   stuSceneImage;                      // 大图信息
+        public NET_FACEDETECT_IMAGE_INFO stuSceneImage;                      // 大图信息
         public NET_POINT                   stuFaceCenter;                      // 人脸型心(不是包围盒中心), 0-8191相对坐标, 相对于小图
         public MEDIAFILE_FACE_DETECTION_INFO()
         {
@@ -2341,7 +2344,7 @@ public interface NetSDKLib extends Library {
         public byte[]				        byReserved=new byte[4];							// 字节对齐
         public int					        nPicIDHigh;								// PictureID高四字节
         public int					        nPicIDLow;								// PictureID低四字节
-        public NET_UPLOAD_CLIENT_INFO	    stuClient1;							// 平台客户端1上传信息
+        public NET_UPLOAD_CLIENT_INFO stuClient1;							// 平台客户端1上传信息
         public NET_UPLOAD_CLIENT_INFO	    stuClient2;							// 平台客户端2上传信息
         public PlateNumber[]				szExtraPlateNumber=(PlateNumber[])new PlateNumber().toArray(3);				// 三地车牌
         public int					nExtraPlateNumberNum;					// 车牌个数
@@ -2801,7 +2804,7 @@ public interface NetSDKLib extends Library {
         public CANDIDATE_INFOEX[]		stuCandidatesEx = (CANDIDATE_INFOEX[])new CANDIDATE_INFOEX().toArray(NET_MAX_CANDIDATE_NUM);	// 当前人脸匹配到的候选对象信息, 实际返回个数同nCandidateNum
         public FACE_INFO_OBJECT			stuFaceInfoObject;                      // 目标人脸信息
         public NET_POINT                stuFaceCenter;                          // 人脸型心(不是包围盒中心), 0-8191相对坐标, 相对于小图
-        public NET_MEDIAFILE_GENERAL_INFO	stuGeneralInfo;							// 通用信息
+        public NET_MEDIAFILE_GENERAL_INFO stuGeneralInfo;							// 通用信息
         public MEDIAFILE_FACERECOGNITION_INFO()
         {
             this.dwSize = this.size();
@@ -3285,7 +3288,7 @@ public interface NetSDKLib extends Library {
         // [3]-曾经建模成功，但因算法升级变得不可用的数量，重新建模就可用
         public int          emRegisterDbType;                     			  // 注册库类型，详见EM_REGISTER_DB_TYPE
         public byte[]		byReserved1=new byte[4];							// 字节对齐
-        public NET_PASSERBY_DB_CONFIG_INFO	stuPasserbyDBConfig;					// 路人库配置（选填）
+        public NET_PASSERBY_DB_CONFIG_INFO stuPasserbyDBConfig;					// 路人库配置（选填）
 
         public NET_FACERECONGNITION_GROUP_INFO()
         {
@@ -32160,8 +32163,8 @@ public interface NetSDKLib extends Library {
     /**
      * 设置二维码信息
      * @param lLoginID 登录句柄
-     * @param pInParam 入参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_2DCODE}
-     * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_2DCODE}
+     * @param pInParam 入参,对应结构体{@link NET_IN_SET_2DCODE}
+     * @param pOutParam 出参,对应结构体{@link NET_OUT_SET_2DCODE}
      * @param nWaitTime 超时时间
      * @return
      */
@@ -32170,9 +32173,9 @@ public interface NetSDKLib extends Library {
     /**
      * 订阅热度图数据,pInParam与pOutParam内存由用户申请释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_ATTACH_VIDEOSTAT_HEATMAP}
-     * @Param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_ATTACH_VIDEOSTAT_HEATMAP}
-     * 也可使用{@link com.zhehekeji.web.lib.joyware.structure.EmptyStructure}
+     * @param pInParam 入参,对应结构体 {@link NET_IN_ATTACH_VIDEOSTAT_HEATMAP}
+     * @Param pOutParam 出参,对应结构体{@link NET_OUT_ATTACH_VIDEOSTAT_HEATMAP}
+     * 也可使用{@link EmptyStructure}
      * @param nWaitTime 超时时间
      * @return
      */
@@ -32181,8 +32184,8 @@ public interface NetSDKLib extends Library {
     /**
      * 获取热图数据,pInParam与pOutParam内存由用户申请释放
      * @param lAttachHandle 热度图订阅句柄
-     * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_VIDEOSTAT_HEATMAP}
-     * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_VIDEOSTAT_HEATMAP}
+     * @param pInParam 入参,对应结构体 {@link NET_IN_GET_VIDEOSTAT_HEATMAP}
+     * @param pOutParam 出参,对应结构体{@link NET_OUT_GET_VIDEOSTAT_HEATMAP}
      * @param nWaitTime 超时时间
      * @return
      */
@@ -32207,8 +32210,8 @@ public interface NetSDKLib extends Library {
     /**
      * 计算两张人脸图片的相似度faceRecognitionServer.matchTwoFace,pstInParam与pstOutParam内存由用户申请释放
      * @param lLoginID 登录句柄
-     * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_MATCH_TWO_FACE_IN}
-     * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_MATCH_TWO_FACE_OUT}
+     * @param pstInParam 入参 {@link NET_MATCH_TWO_FACE_IN}
+     * @param pstOutParam 出参{@link NET_MATCH_TWO_FACE_OUT}
      * @param nWaitTime 接口超时时间,默认超时时间为3000
      * @return
      */
@@ -32219,8 +32222,8 @@ public interface NetSDKLib extends Library {
     /**
      * 设置相机参数, pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_CAMERA_CFG}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_CAMERA_CFG}
+     * @param pInParam 入参 {@link NET_IN_SET_CAMERA_CFG}
+     * @param pOutParam 出参{@link NET_OUT_SET_CAMERA_CFG}
      * @param nWaitTime
      * @return
      */
@@ -32230,8 +32233,8 @@ public interface NetSDKLib extends Library {
     /**
      * 获取相机参数, pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CAMERA_CFG}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CAMERA_CFG}
+     * @param pInParam 入参 {@link NET_IN_GET_CAMERA_CFG}
+     * @param pOutParam 出参{@link NET_OUT_GET_CAMERA_CFG}
      * @param nWaitTime
      * @return
      */
@@ -32241,8 +32244,8 @@ public interface NetSDKLib extends Library {
     /**
      * 设置通道参数, pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_SET_CHANNEL_CFG}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_SET_CHANNEL_CFG}
+     * @param pInParam 入参 {@link NET_IN_SET_CHANNEL_CFG}
+     * @param pOutParam 出参{@link NET_OUT_SET_CHANNEL_CFG}
      * @param nWaitTime
      * @return
      */
@@ -32252,8 +32255,8 @@ public interface NetSDKLib extends Library {
     /**
      * 获取通道参数, pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CHANNEL_CFG}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CHANNEL_CFG}
+     * @param pInParam 入参 {@link NET_IN_GET_CHANNEL_CFG}
+     * @param pOutParam 出参{@link NET_OUT_GET_CHANNEL_CFG}
      * @param nWaitTime
      * @return
      */
@@ -32263,8 +32266,8 @@ public interface NetSDKLib extends Library {
     /**
      * 交通灯信号检测-获取相机信息, pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_CAMERA_INFO}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_CAMERA_INFO}
+     * @param pInParam 入参 {@link NET_IN_GET_CAMERA_INFO}
+     * @param pOutParam 出参{@link NET_OUT_GET_CAMERA_INFO}
      * @param nWaitTime
      * @return
      */
@@ -32276,8 +32279,8 @@ public interface NetSDKLib extends Library {
     /**
      * 主动获取每个热成像点的像素温度
      * @param lLoginID 登录句柄
-     * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_HEATMAPS_INFO}
-     * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_HEATMAPS_INFO}
+     * @param pstInParam 入参 {@link NET_IN_GET_HEATMAPS_INFO}
+     * @param pstOutParam 出参{@link NET_OUT_GET_HEATMAPS_INFO}
      * @param nWaitTime 接口超时时间,默认超时时间为 3000
      * @return
      */
@@ -32382,8 +32385,8 @@ public interface NetSDKLib extends Library {
      /**
       * 获取IPC设备的存储信息
       * @param lLoginID 登录句柄
-      * @param pstInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_GET_DEVICE_AII_INFO}
-      * @param pstOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_GET_DEVICE_AII_INFO}
+      * @param pstInParam 入参 {@link NET_IN_GET_DEVICE_AII_INFO}
+      * @param pstOutParam 出参{@link NET_OUT_GET_DEVICE_AII_INFO}
       * @param nWaitTime
       * @return
       */
@@ -32397,8 +32400,8 @@ public interface NetSDKLib extends Library {
     /**
      * 订阅交通信号灯状态 , pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_ATTACH_TRAFFICLIGHT_INFO}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_ATTACH_TRAFFICLIGHT_INFO}
+     * @param pInParam 入参 {@link NET_IN_ATTACH_TRAFFICLIGHT_INFO}
+     * @param pOutParam 出参{@link NET_OUT_ATTACH_TRAFFICLIGHT_INFO}
      * @param nWaitTime
      * @return
      */
@@ -32414,8 +32417,8 @@ public interface NetSDKLib extends Library {
     /**
      * 订阅雷达的报警点信息 , pInParam 和pOutParam 资源由用户申请和释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_RADAR_ALARMPOINTINFO}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_RADAR_ALARMPOINTINFO}
+     * @param pInParam 入参 {@link NET_IN_RADAR_ALARMPOINTINFO}
+     * @param pOutParam 出参{@link NET_OUT_RADAR_ALARMPOINTINFO}
      * @param nWaitTime
      * @return
      */
@@ -32448,8 +32451,8 @@ public interface NetSDKLib extends Library {
     /**
      * 订阅云台元数据接口,pstuInPtzStatusProc与pstuOutPtzStatusProc内存由用户申请释放
      * @param lLoginID 登录句柄
-     * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_PTZ_STATUS_PROC}
-     * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_PTZ_STATUS_PROC}
+     * @param pInParam 入参 {@link NET_IN_PTZ_STATUS_PROC}
+     * @param pOutParam 出参{@link NET_OUT_PTZ_STATUS_PROC}
      * @param nWaitTime
      * @return
      */

web/src/main/java/com/leaper/web/lib/joyware/StopDownLoadThread.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 import lombok.extern.slf4j.Slf4j;
 

web/src/main/java/com/leaper/web/lib/joyware/ToolKits.java

@@ -1,6 +1,6 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
-import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong;
+import com.leaper.web.lib.joyware.NetSDKLib.LLong;
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;

web/src/main/java/com/leaper/web/lib/joyware/Utils.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware;
+package com.leaper.web.lib.joyware;
 
 import com.sun.jna.Platform;
 

web/src/main/java/com/leaper/web/lib/joyware/common/Base64.java

@@ -25,7 +25,7 @@
 
 
 // Base64解码 使用1.8版本源码  鉴于1.8部分特性1.6版本使用不到 故只保留能使用到的代码 其余删除
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Arrays;

web/src/main/java/com/leaper/web/lib/joyware/common/BorderEx.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 
 import javax.swing.*;
 import javax.swing.border.Border;

web/src/main/java/com/leaper/web/lib/joyware/common/CaseMenu.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 
 import java.lang.reflect.Method;
 import java.util.NoSuchElementException;

web/src/main/java/com/leaper/web/lib/joyware/common/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 
 /**
  * 登录设备设备错误状态

web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskCommonQueue.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;

web/src/main/java/com/leaper/web/lib/joyware/common/EventTaskHandler.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 
 public interface EventTaskHandler {
 

web/src/main/java/com/leaper/web/lib/joyware/common/Res.java

@@ -1,7 +1,7 @@
-package com.zhehekeji.web.lib.joyware.common;
+package com.leaper.web.lib.joyware.common;
 
-import com.zhehekeji.web.lib.joyware.NetSDKLib;
-import com.zhehekeji.web.lib.joyware.NetSDKLib.*;
+import com.leaper.web.lib.joyware.NetSDKLib;
+import com.leaper.web.lib.joyware.NetSDKLib.*;
 
 import java.util.Locale;
 import java.util.ResourceBundle;

web/src/main/java/com/leaper/web/lib/joyware/constant/SDKStructureFieldLenth.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.constant;
+package com.leaper.web.lib.joyware.constant;
 
 /**
  * @author 47081

web/src/main/java/com/leaper/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java

@@ -1,5 +1,6 @@
-package com.zhehekeji.web.lib.joyware.constant;
+package com.leaper.web.lib.joyware.constant;
 
+import com.leaper.web.lib.joyware.structure.ALARM_NO_DISK_INFO;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 
@@ -33,7 +34,7 @@ public class SDK_ALARM_Ex_TYPE {
      */
     public static final int SDK_DISKERROR_ALARM_EX = 0x2107;
     /**
-     * 无硬盘报警,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.ALARM_NO_DISK_INFO}
+     * 无硬盘报警,对应结构体{@link ALARM_NO_DISK_INFO}
      * 对应的回调接口{@link NetSDKLib.fMessCallBack#invoke(int, NetSDKLib.LLong, Pointer, int, String, NativeLong, Pointer)}
      * 对应的接口{@link NetSDKLib#CLIENT_StartListenEx(NetSDKLib.LLong)}
      */

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 47081

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 47081

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 251823

web/src/main/java/com/leaper/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java

@@ -1,4 +1,4 @@
-package com.zhehekeji.web.lib.joyware.enumeration;
+package com.leaper.web.lib.joyware.enumeration;
 
 /**
  * @author 47081