diff --git a/pom.xml b/pom.xml index fd39473..dcb87b9 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.9.RELEASE + 2.3.1.RELEASE com.zhehekeji @@ -55,6 +55,11 @@ org.apache.commons commons-lang3 + + com.google.guava + guava + 18.0 + @@ -94,7 +99,7 @@ nexus Nexus - http://47.99.98.250:28888/repository/maven-public/ + http://maven.aliyun.com/nexus/content/groups/public/ false diff --git a/web/pom.xml b/web/pom.xml index 866490f..ca8a470 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,6 +24,15 @@ base-assembly ${base.assembly.version} + + org.springframework.boot + spring-boot-starter-cache + + + com.google.guava + guava + 18.0 + org.springframework.boot spring-boot-starter-web diff --git a/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java b/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java new file mode 100644 index 0000000..a83bc4a --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/config/CacheConfig.java @@ -0,0 +1,36 @@ +package com.zhehekeji.web.config; + +import com.github.pagehelper.cache.GuavaCache; +import com.google.common.cache.CacheBuilder; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.support.SimpleCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +@Configuration +@EnableCaching +public class CacheConfig { + + @Bean + public CacheManager localCacheManager() { + SimpleCacheManager simpleCacheManager = new SimpleCacheManager(); + //把各个cache注册到cacheManager中，GuavaCache实现了org.springframework.cache.Cache接口 +// CacheBuilder cacheBuilder = CacheBuilder.newBuilder(); +// cacheBuilder. +// simpleCacheManager.setCaches( +// +// Arrays.asList( +// +// //CacheBuilder构建多个cache +// //定义cache名称:@Cacheable的cacheNames(等价value)属性要和此对应 +// new GuavaCache("TIMEOUT_1_HOURS",CacheBuilder.newBuilder().build()), +// new GuavaCache("TIMEOUT_5_MINUTE",CacheBuilder.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build()) +// ) +// ); + return simpleCacheManager; + } +} diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java new file mode 100644 index 0000000..7704f0a --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -0,0 +1,55 @@ +package com.zhehekeji.web.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties +@Data +public class ConfigProperties { + + /** + * 海康球机类型 + */ + public static Integer HIK_CAMERA = 1; + + /** + * 中威球机 + */ + public static Integer JOYWARE_CAMERA = 0; + + private CameraConfig cameraConfig; + + private VideoStyleConfig videoStyleConfig; + + private SavePath savePath; + + private Integer serverMode; + + private String userUrl; + + + @Data + public static class CameraConfig{ + + private Integer cameraType; + private String cameraPassword; + + private String cameraUser; + + private Integer cameraPort; + } + + @Data + public static class VideoStyleConfig{ + private Integer videoStyleRow; + private Integer videoStyleColumn; + } + + @Data + public static class SavePath{ + private String mediaPath; + private String mp4Path; + } +} diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java index bca9bef..1240122 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java @@ -4,6 +4,8 @@ import com.zhehekeji.core.pojo.Result; import com.zhehekeji.core.util.Assert; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -22,7 +25,7 @@ public class CameraControlController { @Resource private CameraMapper cameraMapper; - @Value("${cameraType}") + private Integer cameraType; @PostMapping("/{id}") @@ -38,14 +41,14 @@ public class CameraControlController { Assert.notNull(camera,"球机不存在"); NetSDKLib.LLong lLong = null; if(cameraType == 0){ - lLong = ZWLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),cameraId); + lLong = JoywareLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),cameraId); Assert.isTrue(lLong.longValue() > 0,"登陆失败"); }else if(cameraType == 1){ int userId = HikLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword()); Assert.isTrue(userId>=0,"登陆失败"); lLong = new NetSDKLib.LLong(userId); } - CameraConnMap.conn(cameraId,lLong); + HikLoginModule.CameraConnMap.conn(cameraId,lLong); return lLong; } @@ -55,7 +58,7 @@ public class CameraControlController { log.debug("球机控制向上"); checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlUpStart(id,0,0,1); + JoywarePtzControlModule.ptzControlUpStart(id,0,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlUpStart(id, 1, HCNetSDK.TILT_UP,0); } @@ -68,7 +71,7 @@ public class CameraControlController { log.debug("球机控制向上 停止"); checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlUpEnd(id,0); + JoywarePtzControlModule.ptzControlUpEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlUpEnd(id, 1, HCNetSDK.TILT_UP, 1); } @@ -81,7 +84,7 @@ public class CameraControlController { public Result down(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlDownStart(id,0,0,1); + JoywarePtzControlModule.ptzControlDownStart(id,0,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlDownStart(id , 1,HCNetSDK.TILT_DOWN,0); } @@ -94,7 +97,7 @@ public class CameraControlController { public Result downStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlDownEnd(id,0); + JoywarePtzControlModule.ptzControlDownEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlDownEnd(id, 1, HCNetSDK.TILT_DOWN, 1); } @@ -107,7 +110,7 @@ public class CameraControlController { public Result left(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftStart(id,0,0,1); + JoywarePtzControlModule.ptzControlLeftStart(id,0,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftStart(id, 1,HCNetSDK.PAN_LEFT,0); } @@ -120,7 +123,7 @@ public class CameraControlController { public Result leftStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftEnd(id,0); + JoywarePtzControlModule.ptzControlLeftEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftEnd(id, 1, HCNetSDK.PAN_LEFT, 1); } @@ -135,7 +138,7 @@ public class CameraControlController { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftUpStart(id,0,1,1); + JoywarePtzControlModule.ptzControlLeftUpStart(id,0,1,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftUpStart(id, 1,HCNetSDK.UP_LEFT,0); } @@ -149,7 +152,7 @@ public class CameraControlController { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftUpEnd(id,0); + JoywarePtzControlModule.ptzControlLeftUpEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftUpEnd(id, 1, HCNetSDK.UP_LEFT, 1); } @@ -162,7 +165,7 @@ public class CameraControlController { public Result leftDown(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftDownStart(id,0,1,1); + JoywarePtzControlModule.ptzControlLeftDownStart(id,0,1,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftDownStart(id, 1, HCNetSDK.DOWN_LEFT, 0); } @@ -175,7 +178,7 @@ public class CameraControlController { public Result leftDownStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlLeftDownEnd(id,0); + JoywarePtzControlModule.ptzControlLeftDownEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlLeftDownEnd(id, 1, HCNetSDK.DOWN_LEFT, 1); } @@ -189,7 +192,7 @@ public class CameraControlController { public Result right(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightStart(id,0,0,1); + JoywarePtzControlModule.ptzControlRightStart(id,0,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightStart(id, 1,HCNetSDK.PAN_RIGHT,0); } @@ -203,7 +206,7 @@ public class CameraControlController { public Result rightStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightEnd(id,0); + JoywarePtzControlModule.ptzControlRightEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightEnd(id, 1, HCNetSDK.PAN_RIGHT, 1); } @@ -218,7 +221,7 @@ public class CameraControlController { public Result rightUp(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightUpStart(id,0,1,1); + JoywarePtzControlModule.ptzControlRightUpStart(id,0,1,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightUpStart(id, 1,HCNetSDK.UP_RIGHT,0); } @@ -232,7 +235,7 @@ public class CameraControlController { public Result rightUpStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightUpEnd(id,0); + JoywarePtzControlModule.ptzControlRightUpEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightUpEnd(id, 1, HCNetSDK.UP_RIGHT, 1); } @@ -246,7 +249,7 @@ public class CameraControlController { public Result rightDown(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightDownStart(id,0,1,1); + JoywarePtzControlModule.ptzControlRightDownStart(id,0,1,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightDownStart(id, 1,HCNetSDK.DOWN_RIGHT,0); } @@ -259,7 +262,7 @@ public class CameraControlController { public Result rightDownStop(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlRightDownEnd(id,0); + JoywarePtzControlModule.ptzControlRightDownEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlRightDownEnd(id, 1, HCNetSDK.DOWN_RIGHT, 1); } @@ -273,7 +276,7 @@ public class CameraControlController { public Result ZoomAddStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlZoomAddStart(id,0,1); + JoywarePtzControlModule.ptzControlZoomAddStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlZoomAddStart(id, 1,HCNetSDK.ZOOM_IN, 0); } @@ -285,7 +288,7 @@ public class CameraControlController { public Result ZoomAddEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlZoomAddEnd(id,0); + JoywarePtzControlModule.ptzControlZoomAddEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlZoomAddEnd(id, 1, HCNetSDK.ZOOM_IN, 1); } @@ -298,7 +301,7 @@ public class CameraControlController { public Result ZoomDecStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlZoomDecStart(id,0,1); + JoywarePtzControlModule.ptzControlZoomDecStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlZoomDecStart(id, 1,HCNetSDK.ZOOM_OUT, 0); } @@ -310,7 +313,7 @@ public class CameraControlController { public Result ZoomDecEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlZoomDecEnd(id,0); + JoywarePtzControlModule.ptzControlZoomDecEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlZoomDecEnd(id, 1, HCNetSDK.ZOOM_OUT, 0); } @@ -323,7 +326,7 @@ public class CameraControlController { public Result FocusAddStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlFocusAddStart(id,0,1); + JoywarePtzControlModule.ptzControlFocusAddStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlFocusAddStart(id, 1,HCNetSDK.FOCUS_NEAR, 0); } @@ -336,7 +339,7 @@ public class CameraControlController { public Result focusAddEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlFocusAddEnd(id,0); + JoywarePtzControlModule.ptzControlFocusAddEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlFocusAddEnd(id, 1, HCNetSDK.FOCUS_NEAR, 1); } @@ -349,7 +352,7 @@ public class CameraControlController { public Result FocusDecStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlFocusDecStart(id,0,1); + JoywarePtzControlModule.ptzControlFocusDecStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlFocusDecStart(id, 1,HCNetSDK.FOCUS_FAR, 0); } @@ -361,7 +364,7 @@ public class CameraControlController { public Result focusDecEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlFocusDecEnd(id,0); + JoywarePtzControlModule.ptzControlFocusDecEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlFocusDecEnd(id, 1, HCNetSDK.FOCUS_FAR, 1); } @@ -374,7 +377,7 @@ public class CameraControlController { public Result irisAddStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlIrisAddStart(id,0,1); + JoywarePtzControlModule.ptzControlIrisAddStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlIrisAddStart(id, 1,HCNetSDK.IRIS_OPEN, 0); } @@ -386,7 +389,7 @@ public class CameraControlController { public Result irisAddEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlIrisAddEnd(id,0); + JoywarePtzControlModule.ptzControlIrisAddEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlIrisAddEnd(id, 1, HCNetSDK.IRIS_OPEN, 1); } @@ -398,7 +401,7 @@ public class CameraControlController { public Result irisDecStart(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlIrisDecStart(id,0,1); + JoywarePtzControlModule.ptzControlIrisDecStart(id,0,1); }else if(cameraType == 1){ HikPtzControlModule.ptzControlIrisDecStart(id, 1,HCNetSDK.IRIS_CLOSE, 0); } @@ -411,7 +414,7 @@ public class CameraControlController { public Result irisDecEnd(@PathVariable Integer id) { checkLogin(id); if(cameraType == 0){ - ZWPtzControlModule.ptzControlIrisDecEnd(id,0); + JoywarePtzControlModule.ptzControlIrisDecEnd(id,0); }else if(cameraType == 1){ HikPtzControlModule.ptzControlIrisDecEnd(id, 1, HCNetSDK.IRIS_CLOSE, 1); } @@ -425,7 +428,7 @@ public class CameraControlController { checkLogin(id); OrderInfo orderInfo = new OrderInfo(0L,"SRM123","AAA",1,1,"C5",true); if(cameraType == 0){ - System.out.println(ZWPtzControlModule.pic(id,0,orderInfo)); + System.out.println(JoywarePtzControlModule.pic(id,0,orderInfo)); }else if(cameraType == 1){ System.out.println(HikPtzControlModule.pic(id,1,orderInfo,"D:\\work\\qqq.jpeg")); } @@ -442,7 +445,7 @@ public class CameraControlController { } private void checkLogin(Integer cameraId){ - if(CameraConnMap.getConnId(cameraId) == null){ + if(HikLoginModule.CameraConnMap.getConnId(cameraId) == null){ cameraLogin(cameraId); } } diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index 201d75f..7aaefd4 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -6,7 +6,7 @@ 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.ZWPtzControlModule; +import com.zhehekeji.web.lib.JoywarePtzControlModule; import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq; import com.zhehekeji.web.pojo.camera.CameraIOPtz; import com.zhehekeji.web.pojo.street.StreetSearch; @@ -108,7 +108,7 @@ public class CameraController { //todo //validatorUtil.validate(req); Integer ptzId = cameraService.getPtzId(req.getCameraIOId()); - ZWPtzControlModule.toPtz(ptzId,req.getCameraId()); + JoywarePtzControlModule.toPtz(ptzId,req.getCameraId()); return Result.success(); } } diff --git a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java b/web/src/main/java/com/zhehekeji/web/controller/PLCController.java index eff553a..733c056 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/PLCController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/PLCController.java @@ -5,6 +5,7 @@ import com.zhehekeji.core.util.Assert; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.service.*; +import com.zhehekeji.web.service.robotic.NettyClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 21093ae..acaed88 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.web.entity.Stock; -import com.zhehekeji.web.lib.ZWPtzControlModule; +import com.zhehekeji.web.lib.JoywarePtzControlModule; import com.zhehekeji.web.pojo.category.PageSearch; import com.zhehekeji.web.pojo.stock.CheckByMan; import com.zhehekeji.web.pojo.stock.StockCheck; @@ -114,7 +114,7 @@ public class StockController { @ApiOperation(value = "slow") @RequestMapping(value = "/slow", method = RequestMethod.GET) public Result slow(Integer cameraId,Integer x) { - ZWPtzControlModule.toPtzSlow(cameraId,x); + JoywarePtzControlModule.toPtzSlow(cameraId,x); return Result.success(); } @@ -122,7 +122,7 @@ public class StockController { @ApiOperation(value = "currentPosition") @RequestMapping(value = "/currentPosition", method = RequestMethod.GET) public Result currentPosition(Integer cameraId,Integer ptzId) { - ZWPtzControlModule.turn360C8(cameraId,ptzId); + JoywarePtzControlModule.turn360C8(cameraId,ptzId); return Result.success(); } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/BarCodeScan.java b/web/src/main/java/com/zhehekeji/web/lib/BarCodeScan.java index ff36f20..69a26fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/BarCodeScan.java +++ b/web/src/main/java/com/zhehekeji/web/lib/BarCodeScan.java @@ -1,7 +1,10 @@ package com.zhehekeji.web.lib; +import lombok.extern.slf4j.Slf4j; + import java.lang.reflect.Field; +@Slf4j public class BarCodeScan { public static native String detectBestBarCode(String filePath); @@ -23,7 +26,7 @@ public class BarCodeScan { System.loadLibrary("TestJNI"); }catch(Exception e) { - System.out.println(e); + log.error("detectBestBarCode:"+e); } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/CallBack.java b/web/src/main/java/com/zhehekeji/web/lib/CallBack.java deleted file mode 100644 index b82d047..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/CallBack.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.zhehekeji.web.lib; - -import com.sun.jna.Pointer; -import com.zhehekeji.web.entity.Order; -import com.zhehekeji.web.mapper.OrderMapper; -import lombok.extern.slf4j.Slf4j; - -import java.util.Date; - -@Slf4j -public class CallBack { - - /** - * 球机掉线回调 - */ - public static class DisConnectCallBack implements NetSDKLib.fDisConnect { - - @Override - public void invoke(NetSDKLib.LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) { - Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginID); - log.error("球机：{}掉线",cameraId); - //CameraConnMap.disConn(cameraId); - } - } - - /** - * mp4下载回调 - */ - public static class Mp4ReceiveCB implements NetSDKLib.fTimeDownLoadPosCallBack { - - @Override - public void invoke(NetSDKLib.LLong lPlayHandle, int dwTotalSize, int dwDownLoadSize, int index, NetSDKLib.NET_RECORDFILE_INFO.ByValue recordfileinfo, Pointer dwUser) { - if(dwDownLoadSize == -1) { - OrderRealtime.overDownload(lPlayHandle); - StopDownLoadThread stopDownLoadThread = new StopDownLoadThread(lPlayHandle); - stopDownLoadThread.start(); - } - } - } - - public static class HaveReConnect implements NetSDKLib.fHaveReConnect { - @Override - public void invoke(NetSDKLib.LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) { - log.info("球机：{}重连,loginId:{}",pchDVRIP,m_hLoginHandle.longValue()); - System.out.printf("ReConnect Device[%s] Port[%d]\n", pchDVRIP, nDVRPort); - } - } - - public static class CBPTZStatusProcCallBack implements NetSDKLib.fPTZStatusProcCallBack{ - - private CBPTZStatusProcCallBack() { - } - - private static class CallBackHolder { - private static CBPTZStatusProcCallBack instance = new CBPTZStatusProcCallBack(); - } - - public static CBPTZStatusProcCallBack getInstance() { - return CallBackHolder.instance; - } - - - @Override - public void invoke(NetSDKLib.LLong lLoginId, NetSDKLib.LLong lAttachHandle, Pointer pBuf, int dwBufLen, long dwUser) { - NetSDKLib.NET_PTZ_LOCATION_INFO PTZInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO(); - ToolKits.GetPointerData(pBuf, PTZInfo); -// if(PTZInfo.bState == 2){ -// Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId); -// if(cameraId != null){ -// OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId); -// log.info("cameraId:{}",cameraId); -// if(orderInfo != null && !"C6".equals(orderInfo.getCode())){ -// log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum()); -// //PtzControlModule.pic(cameraId,0,orderInfo); -// } -// CameraCaptureMap.remove(cameraId); -// } -// -// } - } - - } - -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraAction.java b/web/src/main/java/com/zhehekeji/web/lib/CameraAction.java deleted file mode 100644 index 20e39e7..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraAction.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zhehekeji.web.lib; - -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; - -public class CameraAction implements ApplicationRunner { - @Override - public void run(ApplicationArguments args) throws Exception { - - } -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraCaptureMap.java b/web/src/main/java/com/zhehekeji/web/lib/CameraCaptureMap.java deleted file mode 100644 index 8b52374..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraCaptureMap.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.zhehekeji.web.lib; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class CameraCaptureMap { - - private static Map cameraMap = new HashMap<>(); - - public static void put(Integer cameraId,OrderInfo orderInfo){ - if(cameraId != null && orderInfo != null){ - cameraMap.put(cameraId,orderInfo); - } - } - - public static void remove(Integer cameraId){ - cameraMap.remove(cameraId); - } - - public static OrderInfo getOrderInfoByStreetId(Integer cameraId){ - return cameraMap.get(cameraId); - } - - -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java b/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java deleted file mode 100644 index 75ad297..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zhehekeji.web.lib; - -import java.util.HashMap; -import java.util.Map; - -public class CameraConnMap{ - - /** - * key :cameraId - * value: loginId - */ - public static Map cameraMap = new HashMap<>(); - - /** - * key:loginId - * value: cameraId - */ - public static Map loginMap = new HashMap<>(); - - public static void conn(Integer cameraId,NetSDKLib.LLong handlerId){ - synchronized (cameraId.toString().intern()){ - cameraMap.put(cameraId,handlerId); - loginMap.put(handlerId,cameraId); - } - - } - - public static void disConn(Integer cameraId){ - synchronized (cameraId.toString().intern()){ - NetSDKLib.LLong lLong = cameraMap.get(cameraId); - cameraMap.remove(cameraId); - loginMap.remove(lLong); - } - } - - public static NetSDKLib.LLong getConnId(Integer cameraId){ - return cameraMap.get(cameraId); - } - - public static Integer getCameraIdByLoginId(NetSDKLib.LLong lLong){ - return loginMap.get(lLong); - } -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/HikLoginModule.java b/web/src/main/java/com/zhehekeji/web/lib/HikLoginModule.java index 01cb643..d1f50bd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/HikLoginModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/HikLoginModule.java @@ -1,5 +1,12 @@ package com.zhehekeji.web.lib; +import com.zhehekeji.web.lib.hik.HCNetSDK; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + /** * 海康 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 @@ -68,14 +75,6 @@ public class HikLoginModule { * \endif */ public static int login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { - - //注册之前先注销已注册的用户,预览情况下不可注销 - if (m_lUserID > -1) { - //先注销 - hcNetsdk.NET_DVR_Logout(m_lUserID); - m_lUserID = -1; - } - init(); HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO();//设备登录信息 HCNetSDK.NET_DVR_DEVICEINFO_V40 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40();//设备信息 @@ -93,7 +92,7 @@ public class HikLoginModule { m_strLoginInfo.bUseAsynLogin = false; //是否异步登录：0- 否，1- 是 m_strLoginInfo.write(); - m_lUserID = hcNetsdk.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo); + int m_lUserID = hcNetsdk.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo); return m_lUserID; } @@ -118,4 +117,64 @@ public class HikLoginModule { } + @Data + public static class CameraCaptureMap { + + private static Map cameraMap = new HashMap<>(); + + public static void put(Integer cameraId,OrderInfo orderInfo){ + if(cameraId != null && orderInfo != null){ + cameraMap.put(cameraId,orderInfo); + } + } + + public static void remove(Integer cameraId){ + cameraMap.remove(cameraId); + } + + public static OrderInfo getOrderInfoByStreetId(Integer cameraId){ + return cameraMap.get(cameraId); + } + + + } + + public static class CameraConnMap{ + + /** + * key :cameraId + * value: loginId + */ + public static Map cameraMap = new HashMap<>(); + + /** + * key:loginId + * value: cameraId + */ + public static Map loginMap = new HashMap<>(); + + public static void conn(Integer cameraId,NetSDKLib.LLong handlerId){ + synchronized (cameraId.toString().intern()){ + cameraMap.put(cameraId,handlerId); + loginMap.put(handlerId,cameraId); + } + + } + + public static void disConn(Integer cameraId){ + synchronized (cameraId.toString().intern()){ + NetSDKLib.LLong lLong = cameraMap.get(cameraId); + cameraMap.remove(cameraId); + loginMap.remove(lLong); + } + } + + public static NetSDKLib.LLong getConnId(Integer cameraId){ + return cameraMap.get(cameraId); + } + + public static Integer getCameraIdByLoginId(NetSDKLib.LLong lLong){ + return loginMap.get(lLong); + } + } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/HikPtzControlModule.java b/web/src/main/java/com/zhehekeji/web/lib/HikPtzControlModule.java index 121aedd..b8eeb49 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/HikPtzControlModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/HikPtzControlModule.java @@ -3,9 +3,11 @@ package com.zhehekeji.web.lib; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.common.util.PathUtil; import com.zhehekeji.core.util.Assert; +import com.zhehekeji.web.lib.hik.HCNetSDK; +import com.zhehekeji.web.lib.joyware.NET_IN_PTZ_STATUS_PROC; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import lombok.extern.slf4j.Slf4j; -import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; /** @@ -15,14 +17,14 @@ import java.time.LocalDateTime; @Slf4j public class HikPtzControlModule { - private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB(); + private static NET_IN_PTZ_STATUS_PROC.CallBack.Mp4ReceiveCB mp4ReceiveCB = new NET_IN_PTZ_STATUS_PROC.CallBack.Mp4ReceiveCB(); /** * 向上 */ public static boolean ptzControlUpStart(Integer cameraId, int nChannelID, int dwPTZCommand,int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); //return LoginModule.hcNetsdk.NET_DVR_PTZControl(lUserId, dwPTZCommand, 0); @@ -30,7 +32,7 @@ public class HikPtzControlModule { public static boolean ptzControlUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -39,13 +41,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -54,13 +56,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlLeftEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -68,13 +70,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlRightStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlRightEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.PAN_RIGHT, 1); } /** @@ -82,13 +84,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -97,13 +99,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.UP_RIGHT, 0); } public static boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, HCNetSDK.UP_RIGHT, 1); } /** @@ -111,12 +113,12 @@ public class HikPtzControlModule { */ public static boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -124,13 +126,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -139,13 +141,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -154,13 +156,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -168,13 +170,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -182,13 +184,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -196,13 +198,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } /** @@ -210,13 +212,13 @@ public class HikPtzControlModule { */ public static boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 0); } public static boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID, int dwPTZCommand, int dwStop) { - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); return HikLoginModule.hcNetsdk.NET_DVR_PTZControl_Other(lUserId, nChannelID, dwPTZCommand, 1); } @@ -225,7 +227,7 @@ public class HikPtzControlModule { Integer cmdSerial = OrderCmdSerial.nextSerial(); PathUtil.checkDirc(path); OrderCmdSerial.put(cmdSerial, orderInfo); - int lUserId = CameraConnMap.getConnId(cameraId).intValue(); + int lUserId = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); short wPicSize = 3; short wPicQuality = 0; HCNetSDK.NET_DVR_JPEGPARA jpegpara = new HCNetSDK.NET_DVR_JPEGPARA(wPicSize, wPicQuality); @@ -270,7 +272,7 @@ public class HikPtzControlModule { struDownloadCond.write(); log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}", path, startTime.toString(), endTime.toString(), LocalDateTime.now()); - int lUserID = CameraConnMap.getConnId(cameraId).intValue(); + int lUserID = HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(); int result = HikLoginModule.hcNetsdk.NET_DVR_GetFileByTime(lUserID,1,startTime,endTime,path); //int result = HikLoginModule.hcNetsdk.NET_DVR_GetFileByTime_V40(lUserID, path.getBytes(), struDownloadCond); if (result < 0) { @@ -376,7 +378,7 @@ public class HikPtzControlModule { public static void ptz(Integer ptzId, String name, Integer cameraId) { int dwzCommand = HCNetSDK.SET_PRESET; - Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwzCommand, ptzId.intValue()); + Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(), 1, dwzCommand, ptzId.intValue()); Assert.isTrue(ok, "设置失败"); } /** @@ -396,7 +398,7 @@ public class HikPtzControlModule { public static void toPtz(Integer ptzId, Integer cameraId) { int dwPTZCommand = HCNetSDK.GOTO_PRESET; - Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId.intValue()); + Boolean ok = HikLoginModule.hcNetsdk.NET_DVR_PTZPreset_Other(HikLoginModule.CameraConnMap.getConnId(cameraId).intValue(), 1, dwPTZCommand, ptzId.intValue()); if (!ok) { log.error("转至预置点 失败 cameraId:{},ptzId:{}", cameraId, ptzId); } diff --git a/web/src/main/java/com/zhehekeji/web/lib/ImageAlgLib.java b/web/src/main/java/com/zhehekeji/web/lib/ImageAlgLib.java deleted file mode 100644 index 85f518d..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/ImageAlgLib.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zhehekeji.web.lib; - -import com.sun.jna.Library; -import com.sun.jna.Native; - -/** - * SDK JNA接口封装 - */ -public interface ImageAlgLib extends Library { - ImageAlgLib IMAGEALG_INSTANCE = (ImageAlgLib)Native.loadLibrary(Utils.getLoadLibrary("ImageAlg"), ImageAlgLib.class); - - - /******************************************************************************* - * 函数名 : drcTable - * 描 述 : raw数据转换成Y数据 - * 输 入 : - pRaw: 14bit裸数据 - * 输 入 : - height: 输入裸数据的高 - * 输 入 : - width: 输入裸数据的宽 - * 输 入 : - sel: 默认填0 - * 输 入 : - lut: 当sel为1时，该参数为本地drc表，默认填0 - * 输 出 : pYData：转换后的Y数据 - * 返回值 : 0 : 成功 - * -1: 失败 - *******************************************************************************/ - int drcTable(short[] pRaw, short width, short height, int sel, byte[] pYData, short[] lut); - -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/ZWLoginModule.java b/web/src/main/java/com/zhehekeji/web/lib/JoywareLoginModule.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/ZWLoginModule.java rename to web/src/main/java/com/zhehekeji/web/lib/JoywareLoginModule.java index 6ff27b7..c39b40c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/ZWLoginModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/JoywareLoginModule.java @@ -1,16 +1,19 @@ package com.zhehekeji.web.lib; import com.zhehekeji.common.util.SpringContextUtil; -import com.zhehekeji.web.lib.NetSDKLib.LLong; -import com.zhehekeji.web.lib.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY; -import com.zhehekeji.web.lib.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY; -import java.io.File; +import com.zhehekeji.web.lib.joyware.CaptureReceiveCB; +import com.zhehekeji.web.lib.joyware.NET_IN_PTZ_STATUS_PROC; +import com.zhehekeji.web.lib.joyware.NET_OUT_PTZ_STATUS_PROC; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +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; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 */ -public class ZWLoginModule{ +public class JoywareLoginModule { public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE; public static NetSDKLib configsdk = NetSDKLib.CONFIG_INSTANCE; @@ -18,9 +21,9 @@ public class ZWLoginModule{ // 设备信息 public static NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex(); - private static CallBack.DisConnectCallBack disConnectCallBack = new CallBack.DisConnectCallBack(); + private static NET_IN_PTZ_STATUS_PROC.CallBack.DisConnectCallBack disConnectCallBack = new NET_IN_PTZ_STATUS_PROC.CallBack.DisConnectCallBack(); - private static CallBack.HaveReConnect haveReConnect = new CallBack.HaveReConnect(); + private static NET_IN_PTZ_STATUS_PROC.CallBack.HaveReConnect haveReConnect = new NET_IN_PTZ_STATUS_PROC.CallBack.HaveReConnect(); // 登陆句柄 public static LLong m_hLoginHandle = new LLong(0); @@ -41,25 +44,6 @@ public class ZWLoginModule{ System.out.println("Initialize SDK failed"); return false; } - //Res res = Res.string(); - - //打开日志，可选 -// NetSDKLib.LOG_SET_PRINT_INFO setLog = new NetSDKLib.LOG_SET_PRINT_INFO(); -// File path = new File("./sdklog/"); -// if (!path.exists()) { -// path.mkdir(); -// } -// String logPath = path.getAbsoluteFile().getParent() + "\\sdklog\\" + ToolKits.getDate() + ".log"; -// setLog.nPrintStrategy = 0; -// setLog.bSetFilePath = 1; -// System.arraycopy(logPath.getBytes(), 0, setLog.szLogFilePath, 0, logPath.getBytes().length); -// System.out.println(logPath); -// setLog.bSetPrintStrategy = 1; -// bLogopen = netsdk.CLIENT_LogOpen(setLog); -// if(!bLogopen ) { -// System.err.println("Failed to open NetSDK log"); -// } - // 设置断线重连回调接口，设置过断线重连成功回调函数后，当设备出现断线情况，SDK内部会自动进行重连操作 // 此操作为可选操作，但建议用户进行设置 netsdk.CLIENT_SetAutoReconnect(haveReConnect, null); @@ -119,7 +103,7 @@ public class ZWLoginModule{ NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam=new 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); - m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam); + LLong m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam); attachPTZStatusProc(); return m_hLoginHandle; @@ -131,7 +115,7 @@ public class ZWLoginModule{ public static void attachPTZStatusProc() { NET_IN_PTZ_STATUS_PROC pIn = new NET_IN_PTZ_STATUS_PROC(); pIn.nChannel = 0; - pIn.cbPTZStatusProc = CallBack.CBPTZStatusProcCallBack.getInstance(); + pIn.cbPTZStatusProc = NET_IN_PTZ_STATUS_PROC.CallBack.CBPTZStatusProcCallBack.getInstance(); pIn.write(); NET_OUT_PTZ_STATUS_PROC pOut = new NET_OUT_PTZ_STATUS_PROC(); pOut.write(); diff --git a/web/src/main/java/com/zhehekeji/web/lib/ZWPtzControlModule.java b/web/src/main/java/com/zhehekeji/web/lib/JoywarePtzControlModule.java similarity index 71% rename from web/src/main/java/com/zhehekeji/web/lib/ZWPtzControlModule.java rename to web/src/main/java/com/zhehekeji/web/lib/JoywarePtzControlModule.java index 367d069..e92f7db 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/ZWPtzControlModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/JoywarePtzControlModule.java @@ -3,6 +3,9 @@ package com.zhehekeji.web.lib; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.common.util.PathUtil; import com.zhehekeji.core.util.Assert; +import com.zhehekeji.web.lib.joyware.NET_IN_PTZ_STATUS_PROC; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.ToolKits; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; @@ -12,23 +15,23 @@ import java.time.LocalDateTime; * 主要有 ：八个方向控制、变倍、变焦、光圈功能 */ @Slf4j -public class ZWPtzControlModule { +public class JoywarePtzControlModule { - private static CallBack.Mp4ReceiveCB mp4ReceiveCB = new CallBack.Mp4ReceiveCB(); + private static NET_IN_PTZ_STATUS_PROC.CallBack.Mp4ReceiveCB mp4ReceiveCB = new NET_IN_PTZ_STATUS_PROC.CallBack.Mp4ReceiveCB(); /** * 向上 */ public static boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, lParam1, lParam2, 0, 0); } public static boolean ptzControlUpEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, 0, 0, 0, 1); } @@ -37,13 +40,13 @@ public class ZWPtzControlModule { * 向下 */ public static boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, lParam1, lParam2, 0, 0); } public static boolean ptzControlDownEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, 0, 0, 0, 1); } @@ -52,13 +55,13 @@ public class ZWPtzControlModule { * 向左 */ public static boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, lParam1, lParam2, 0, 0); } public static boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, 0, 0, 0, 1); } @@ -67,13 +70,13 @@ public class ZWPtzControlModule { * 向右 */ public static boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, lParam1, lParam2, 0, 0); } public static boolean ptzControlRightEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, 0, 0, 0, 1); } @@ -82,13 +85,13 @@ public class ZWPtzControlModule { * 向左上 */ public static boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, lParam1, lParam2, 0, 0); } public static boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, 0, 0, 0, 1); } @@ -97,13 +100,13 @@ public class ZWPtzControlModule { * 向右上 */ public static boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, lParam1, lParam2, 0, 0); } public static boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, 0, 0, 0, 1); } @@ -112,13 +115,13 @@ public class ZWPtzControlModule { * 向左下 */ public static boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, lParam1, lParam2, 0, 0); } public static boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, 0, 0, 0, 1); } @@ -127,13 +130,13 @@ public class ZWPtzControlModule { * 向右下 */ public static boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, lParam1, lParam2, 0, 0); } public static boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, 0, 0, 0, 1); } @@ -142,13 +145,13 @@ public class ZWPtzControlModule { * 变倍+ */ public static boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, 0, 0, 0, 1); } @@ -157,13 +160,13 @@ public class ZWPtzControlModule { * 变倍- */ public static boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, 0, 0, 0, 1); } @@ -172,13 +175,13 @@ public class ZWPtzControlModule { * 变焦+ */ public static boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, 0, 0, 0, 1); } @@ -187,13 +190,13 @@ public class ZWPtzControlModule { * 变焦- */ public static boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, 0, 0, 0, 1); } @@ -202,13 +205,13 @@ public class ZWPtzControlModule { * 光圈+ */ public static boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, 0, 0, 0, 1); } @@ -217,13 +220,13 @@ public class ZWPtzControlModule { * 光圈- */ public static boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int lParam2) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, 0, lParam2, 0, 0); } public static boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID) { - return ZWLoginModule.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx(HikLoginModule.CameraConnMap.getConnId(cameraId), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, 0, 0, 0, 1); } @@ -237,7 +240,7 @@ public class ZWPtzControlModule { stuSnapParams.CmdSerial = OrderCmdSerial.nextSerial(); OrderCmdSerial.put(stuSnapParams.CmdSerial, orderInfo); IntByReference reserved = new IntByReference(0); - return ZWLoginModule.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved); + return JoywareLoginModule.netsdk.CLIENT_SnapPictureEx(HikLoginModule.CameraConnMap.getConnId(cameraId), stuSnapParams, reserved); } @@ -261,7 +264,7 @@ public class ZWPtzControlModule { NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE(); net_out_download_by_data_type.write(); log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{}", path, startTime.toString(), endTime.toString(), LocalDateTime.now()); - NetSDKLib.LLong l = ZWLoginModule.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000); + NetSDKLib.LLong l = JoywareLoginModule.netsdk.CLIENT_DownloadByDataType(HikLoginModule.CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000); if (l.longValue() == 0) { log.error("download error :{}", ToolKits.getErrorCodePrint()); } else { @@ -278,7 +281,7 @@ public class ZWPtzControlModule { */ public static void ptz(Integer ptzId, String name, Integer cameraId) { int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL; - Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name)); + Boolean ok = JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx2(HikLoginModule.CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name)); Assert.isTrue(ok, "设置失败"); } @@ -290,7 +293,7 @@ public class ZWPtzControlModule { */ public static void toPtz(Integer ptzId, Integer cameraId) { int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL; - Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null); + Boolean ok = JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx2(HikLoginModule.CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null); if (!ok) { log.error("转至预置点 失败 cameraId:{},ptzId:{},error:{}", cameraId, ptzId,ToolKits.getErrorCodePrint()); } @@ -311,7 +314,7 @@ public class ZWPtzControlModule { absolutely.stuSpeed.fPositionY = 0.2f; absolutely.write(); //absolutely.stuSpeed.fZoom = 0.5f; - Boolean ok = ZWLoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, + Boolean ok = JoywareLoginModule.netsdk.CLIENT_DHPTZControlEx2(HikLoginModule.CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, 0, 0, 0, absolutely.getPointer()); if (!ok) { @@ -333,7 +336,7 @@ public class ZWPtzControlModule { ptzLocationInfo.write(); System.out.println("size:"+ptzLocationInfo.size()); - boolean bRet = ZWLoginModule.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000); + boolean bRet = JoywareLoginModule.netsdk.CLIENT_QueryDevState(HikLoginModule.CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000); ptzLocationInfo.read(); if (bRet) { diff --git a/web/src/main/java/com/zhehekeji/web/lib/NET_IN_PTZ_STATUS_PROC.java b/web/src/main/java/com/zhehekeji/web/lib/NET_IN_PTZ_STATUS_PROC.java deleted file mode 100644 index bf14e84..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/NET_IN_PTZ_STATUS_PROC.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zhehekeji.web.lib; - -/** - * @author 251823 - * @description 订阅云台元数据接口输入参数 - * @date 2021/02/26 - */ -public class NET_IN_PTZ_STATUS_PROC extends NetSDKLib.SdkStructure{ - /** - * dwSize; - */ - public int dwSize; - /** - * 云台通道 - */ - public int nChannel; - - /** - * 状态回调函数 - */ - public NetSDKLib.fPTZStatusProcCallBack cbPTZStatusProc; - - /** - * 用户数据 - */ - public long dwUser; - - public NET_IN_PTZ_STATUS_PROC(){ - this.dwSize = this.size(); - } - -} diff --git a/web/src/main/java/com/zhehekeji/web/lib/NativeString.java b/web/src/main/java/com/zhehekeji/web/lib/NativeString.java deleted file mode 100644 index 2ce0605..0000000 --- a/web/src/main/java/com/zhehekeji/web/lib/NativeString.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.zhehekeji.web.lib; - -import com.sun.jna.Memory; -import com.sun.jna.Native; -import com.sun.jna.Pointer; - -import java.io.UnsupportedEncodingException; -import java.nio.CharBuffer; - - -/** Provides a temporary allocation of an immutable C string - * (const char* or const wchar_t*) for use when - * converting a Java String into a native memory function argument. - * - * @author Todd Fast, todd.fast@sun.com - * @author twall@users.sf.net - */ -public class NativeString implements CharSequence, Comparable { - - private Pointer pointer; - private boolean wide; - - /** Create a native string (NUL-terminated array of char).

- * If the system property jna.encoding is set, its value will - * be used to encode the native string. If not set or if the encoding - * is unavailable, the default platform encoding will be used. - */ - public NativeString(String string) { - this(string, false); - } - - /** Create a native string as a NUL-terminated array of wchar_t - * (if wide is true) or char.

- * If the system property jna.encoding is set, its value will - * be used to encode the native charstring. - * If not set or if the encoding is unavailable, the default platform - * encoding will be used. - * - * @param string value to write to native memory - * @param wide whether to store the String as wchar_t - */ - public NativeString(String string, boolean wide) { - if (string == null) { - throw new NullPointerException("String must not be null"); - } - // Allocate the memory to hold the string. Note, we have to - // make this 1 element longer in order to accommodate the terminating - // NUL (which is generated in Pointer.setString()). - this.wide = wide; - if (wide) { - int len = (string.length() + 1 ) * Native.WCHAR_SIZE; - pointer = new Memory(len); - pointer.setString(0, string); - } - else { - byte[] data = getBytes(string); - pointer = new Memory(data.length + 1); - pointer.write(0, data, 0, data.length); - pointer.setByte(data.length, (byte)0); - } - } - - static byte[] getBytes(String s) { - try { - return getBytes(s, System.getProperty("jna.encoding")); - } - catch (UnsupportedEncodingException e) { - return s.getBytes(); - } - } - - /** Return a byte array corresponding to the given String, using the given - encoding. - */ - static byte[] getBytes(String s, String encoding) throws UnsupportedEncodingException { - if (encoding != null) { - return s.getBytes(encoding); - } - return s.getBytes(); - } - - public int hashCode() { - return toString().hashCode(); - } - - public boolean equals(Object other) { - - if (other instanceof CharSequence) { - return compareTo(other) == 0; - } - return false; - } - - public String toString() { - String s = wide ? "const wchar_t*" : "const char*"; - s += "(" + pointer.getString(0) + ")"; - return s; - } - - public Pointer getPointer() { - return pointer; - } - - public char charAt(int index) { - return toString().charAt(index); - } - - public int length() { - return toString().length(); - } - - public CharSequence subSequence(int start, int end) { - return CharBuffer.wrap(toString()).subSequence(start, end); - } - - public int compareTo(Object other) { - - if (other == null) - return 1; - - return toString().compareTo(other.toString()); - } -} - diff --git a/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java b/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java index 16958c9..4847610 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java +++ b/web/src/main/java/com/zhehekeji/web/lib/OrderRealtime.java @@ -1,5 +1,7 @@ package com.zhehekeji.web.lib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/web/src/main/java/com/zhehekeji/web/lib/HCNetSDK.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/HCNetSDK.java rename to web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java index e1d37ec..9e2e61f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/HCNetSDK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java @@ -9,7 +9,7 @@ * Created on 2009-9-14, 19:31:34 */ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.hik; import com.sun.jna.Native; import com.sun.jna.Pointer; diff --git a/web/src/main/java/com/zhehekeji/web/lib/CaptureReceiveCB.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/CaptureReceiveCB.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java index d7f9efb..138ce33 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CaptureReceiveCB.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureReceiveCB.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; import com.sun.jna.Pointer; -import com.zhehekeji.web.mapper.OrderLastMediaMapper; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.mapper.OrderMapper; import com.zhehekeji.web.mapper.StockMapper; import lombok.extern.slf4j.Slf4j; @@ -25,8 +25,8 @@ public class CaptureReceiveCB implements NetSDKLib.fSnapRev{ @Resource private OrderMapper orderMapper; - @Value("${mediaPath}") - private String mediaPath; + @Resource + private ConfigProperties configProperties; private static String fileType = "jpg"; @@ -41,7 +41,7 @@ public class CaptureReceiveCB implements NetSDKLib.fSnapRev{ @Override public void invoke(NetSDKLib.LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser) { - CaptureRunnable captureRunnable = new CaptureRunnable(CmdSerial,fileType,RevLen,mediaPath,pBuf,orderMapper,stockMapper); + CaptureRunnable captureRunnable = new CaptureRunnable(CmdSerial,fileType,RevLen,configProperties.getSavePath().getMediaPath(),pBuf,orderMapper,stockMapper); threadPoolExecutor.execute(captureRunnable); } diff --git a/web/src/main/java/com/zhehekeji/web/lib/CaptureRunnable.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureRunnable.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/CaptureRunnable.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureRunnable.java index a6d070b..cc243f6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CaptureRunnable.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/CaptureRunnable.java @@ -1,9 +1,11 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; import com.sun.jna.Pointer; import com.zhehekeji.common.util.PathUtil; import com.zhehekeji.web.entity.Order; import com.zhehekeji.web.entity.Stock; +import com.zhehekeji.web.lib.OrderCmdSerial; +import com.zhehekeji.web.lib.OrderInfo; import com.zhehekeji.web.mapper.OrderMapper; import com.zhehekeji.web.mapper.StockMapper; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java new file mode 100644 index 0000000..bafa1a0 --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_IN_PTZ_STATUS_PROC.java @@ -0,0 +1,112 @@ +package com.zhehekeji.web.lib.joyware; + +import com.sun.jna.Pointer; +import com.zhehekeji.web.lib.HikLoginModule; +import com.zhehekeji.web.lib.OrderRealtime; +import lombok.extern.slf4j.Slf4j; + +/** + * @author 251823 + * @description 订阅云台元数据接口输入参数 + * @date 2021/02/26 + */ +public class NET_IN_PTZ_STATUS_PROC extends NetSDKLib.SdkStructure{ + /** + * dwSize; + */ + public int dwSize; + /** + * 云台通道 + */ + public int nChannel; + + /** + * 状态回调函数 + */ + public NetSDKLib.fPTZStatusProcCallBack cbPTZStatusProc; + + /** + * 用户数据 + */ + public long dwUser; + + public NET_IN_PTZ_STATUS_PROC(){ + this.dwSize = this.size(); + } + + @Slf4j + public static class CallBack { + + /** + * 球机掉线回调 + */ + public static class DisConnectCallBack implements NetSDKLib.fDisConnect { + + @Override + public void invoke(NetSDKLib.LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) { + Integer cameraId = HikLoginModule.CameraConnMap.getCameraIdByLoginId(lLoginID); + log.error("球机：{}掉线",cameraId); + //CameraConnMap.disConn(cameraId); + } + } + + /** + * mp4下载回调 + */ + public static class Mp4ReceiveCB implements NetSDKLib.fTimeDownLoadPosCallBack { + + @Override + public void invoke(NetSDKLib.LLong lPlayHandle, int dwTotalSize, int dwDownLoadSize, int index, NetSDKLib.NET_RECORDFILE_INFO.ByValue recordfileinfo, Pointer dwUser) { + if(dwDownLoadSize == -1) { + OrderRealtime.overDownload(lPlayHandle); + StopDownLoadThread stopDownLoadThread = new StopDownLoadThread(lPlayHandle); + stopDownLoadThread.start(); + } + } + } + + public static class HaveReConnect implements NetSDKLib.fHaveReConnect { + @Override + public void invoke(NetSDKLib.LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) { + log.info("球机：{}重连,loginId:{}",pchDVRIP,m_hLoginHandle.longValue()); + System.out.printf("ReConnect Device[%s] Port[%d]\n", pchDVRIP, nDVRPort); + } + } + + public static class CBPTZStatusProcCallBack implements NetSDKLib.fPTZStatusProcCallBack{ + + private CBPTZStatusProcCallBack() { + } + + private static class CallBackHolder { + private static CBPTZStatusProcCallBack instance = new CBPTZStatusProcCallBack(); + } + + public static CBPTZStatusProcCallBack getInstance() { + return CallBackHolder.instance; + } + + + @Override + public void invoke(NetSDKLib.LLong lLoginId, NetSDKLib.LLong lAttachHandle, Pointer pBuf, int dwBufLen, long dwUser) { + NetSDKLib.NET_PTZ_LOCATION_INFO PTZInfo = new NetSDKLib.NET_PTZ_LOCATION_INFO(); + ToolKits.GetPointerData(pBuf, PTZInfo); + // if(PTZInfo.bState == 2){ + // Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginId); + // if(cameraId != null){ + // OrderInfo orderInfo = CameraCaptureMap.getOrderInfoByStreetId(cameraId); + // log.info("cameraId:{}",cameraId); + // if(orderInfo != null && !"C6".equals(orderInfo.getCode())){ + // log.info("cameraId:{} 到位 拍照,code:{},orderNUm:{}",cameraId,orderInfo.getCode(),orderInfo.getOrderNum()); + // //PtzControlModule.pic(cameraId,0,orderInfo); + // } + // CameraCaptureMap.remove(cameraId); + // } + // + // } + } + + } + + } +} diff --git a/web/src/main/java/com/zhehekeji/web/lib/NET_OUT_PTZ_STATUS_PROC.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/NET_OUT_PTZ_STATUS_PROC.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java index 52c51c6..69440f1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/NET_OUT_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/NET_OUT_PTZ_STATUS_PROC.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; /** * @author 251823 * @description 订阅云台元数据接口输输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java index 63e484d..b05b9b1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/NetSDKLib.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib; -import com.zhehekeji.web.lib.enumeration.EM_FILTER_IMAGE_TYPE; -import com.zhehekeji.web.lib.structure.*; +package com.zhehekeji.web.lib.joyware; +import com.zhehekeji.web.lib.joyware.enumeration.EM_FILTER_IMAGE_TYPE; +import com.zhehekeji.web.lib.joyware.structure.*; import com.sun.jna.*; import com.sun.jna.ptr.IntByReference; import java.lang.reflect.Field; @@ -32160,8 +32160,8 @@ public interface NetSDKLib extends Library { /** * 设置二维码信息 * @param lLoginID 登录句柄 - * @param pInParam 入参,对应结构体{@link com.zhehekeji.web.lib.structure.NET_IN_SET_2DCODE} - * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.structure.NET_OUT_SET_2DCODE} + * @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 nWaitTime 超时时间 * @return */ @@ -32170,9 +32170,9 @@ public interface NetSDKLib extends Library { /** * 订阅热度图数据,pInParam与pOutParam内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.structure.NET_IN_ATTACH_VIDEOSTAT_HEATMAP} - * @Param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.structure.NET_OUT_ATTACH_VIDEOSTAT_HEATMAP} - * 也可使用{@link com.zhehekeji.web.lib.structure.EmptyStructure} + * @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 nWaitTime 超时时间 * @return */ @@ -32181,8 +32181,8 @@ public interface NetSDKLib extends Library { /** * 获取热图数据,pInParam与pOutParam内存由用户申请释放 * @param lAttachHandle 热度图订阅句柄 - * @param pInParam 入参,对应结构体 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_VIDEOSTAT_HEATMAP} - * @param pOutParam 出参,对应结构体{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_VIDEOSTAT_HEATMAP} + * @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 nWaitTime 超时时间 * @return */ @@ -32207,8 +32207,8 @@ public interface NetSDKLib extends Library { /** * 计算两张人脸图片的相似度faceRecognitionServer.matchTwoFace,pstInParam与pstOutParam内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_MATCH_TWO_FACE_IN} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_MATCH_TWO_FACE_OUT} + * @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 nWaitTime 接口超时时间,默认超时时间为3000 * @return */ @@ -32219,8 +32219,8 @@ public interface NetSDKLib extends Library { /** * 设置相机参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_SET_CAMERA_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_SET_CAMERA_CFG} + * @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 nWaitTime * @return */ @@ -32230,8 +32230,8 @@ public interface NetSDKLib extends Library { /** * 获取相机参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_CAMERA_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_CAMERA_CFG} + * @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 nWaitTime * @return */ @@ -32241,8 +32241,8 @@ public interface NetSDKLib extends Library { /** * 设置通道参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_SET_CHANNEL_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_SET_CHANNEL_CFG} + * @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 nWaitTime * @return */ @@ -32252,8 +32252,8 @@ public interface NetSDKLib extends Library { /** * 获取通道参数, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_CHANNEL_CFG} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_CHANNEL_CFG} + * @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 nWaitTime * @return */ @@ -32263,8 +32263,8 @@ public interface NetSDKLib extends Library { /** * 交通灯信号检测-获取相机信息, pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_CAMERA_INFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_CAMERA_INFO} + * @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 nWaitTime * @return */ @@ -32276,8 +32276,8 @@ public interface NetSDKLib extends Library { /** * 主动获取每个热成像点的像素温度 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_HEATMAPS_INFO} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_HEATMAPS_INFO} + * @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 nWaitTime 接口超时时间,默认超时时间为 3000 * @return */ @@ -32382,8 +32382,8 @@ public interface NetSDKLib extends Library { /** * 获取IPC设备的存储信息 * @param lLoginID 登录句柄 - * @param pstInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_GET_DEVICE_AII_INFO} - * @param pstOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_GET_DEVICE_AII_INFO} + * @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 nWaitTime * @return */ @@ -32397,8 +32397,8 @@ public interface NetSDKLib extends Library { /** * 订阅交通信号灯状态 , pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_ATTACH_TRAFFICLIGHT_INFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_ATTACH_TRAFFICLIGHT_INFO} + * @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 nWaitTime * @return */ @@ -32414,8 +32414,8 @@ public interface NetSDKLib extends Library { /** * 订阅雷达的报警点信息 , pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_RADAR_ALARMPOINTINFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_RADAR_ALARMPOINTINFO} + * @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 nWaitTime * @return */ @@ -32448,8 +32448,8 @@ public interface NetSDKLib extends Library { /** * 订阅云台元数据接口,pstuInPtzStatusProc与pstuOutPtzStatusProc内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.structure.NET_IN_PTZ_STATUS_PROC} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.structure.NET_OUT_PTZ_STATUS_PROC} + * @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 nWaitTime * @return */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/StopDownLoadThread.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/StopDownLoadThread.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java index 984ed88..b6ce306 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/StopDownLoadThread.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java @@ -1,5 +1,6 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; +import com.zhehekeji.web.lib.JoywareLoginModule; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -14,6 +15,6 @@ public class StopDownLoadThread extends Thread { @Override public void run() { log.info("stop download:{}",lPlayHandle.longValue()); - ZWLoginModule.netsdk.CLIENT_StopDownload(lPlayHandle); + JoywareLoginModule.netsdk.CLIENT_StopDownload(lPlayHandle); } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/ToolKits.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/ToolKits.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java index 7de67c9..006f507 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/ToolKits.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; -import com.zhehekeji.web.lib.common.ErrorCode; -import com.zhehekeji.web.lib.NetSDKLib.LLong; +import com.zhehekeji.web.lib.JoywareLoginModule; +import com.zhehekeji.web.lib.joyware.common.ErrorCode; +import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong; import com.sun.jna.Memory; import com.sun.jna.Pointer; import com.sun.jna.Structure; @@ -346,7 +347,7 @@ public class ToolKits { * 登录设备设备错误状态, 用于界面显示 */ public static String getErrorCodeShow() { - return ErrorCode.getErrorCode(ZWLoginModule.netsdk.CLIENT_GetLastError()); + return ErrorCode.getErrorCode(JoywareLoginModule.netsdk.CLIENT_GetLastError()); } /** @@ -354,8 +355,8 @@ public class ToolKits { * @return */ public static String getErrorCodePrint() { - return "\n{error code: (0x80000000|" + (ZWLoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +").参考 NetSDKLib.java }" - + " - {error info:" + ErrorCode.getErrorCode(ZWLoginModule.netsdk.CLIENT_GetLastError()) + "}\n"; + return "\n{error code: (0x80000000|" + (JoywareLoginModule.netsdk.CLIENT_GetLastError() & 0x7fffffff) +").参考 NetSDKLib.java }" + + " - {error info:" + ErrorCode.getErrorCode(JoywareLoginModule.netsdk.CLIENT_GetLastError()) + "}\n"; } /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/Utils.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/Utils.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java index dedbbfc..64eec4e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/Utils.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib; +package com.zhehekeji.web.lib.joyware; import com.sun.jna.Platform; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/Base64.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/common/Base64.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java index 2072b4b..ec433b8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/Base64.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Base64.java @@ -25,7 +25,7 @@ // Base64解码 使用1.8版本源码 鉴于1.8部分特性1.6版本使用不到 故只保留能使用到的代码 其余删除 -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/BorderEx.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/common/BorderEx.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java index 20cfeb1..e4d6e27 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/BorderEx.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/BorderEx.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; import javax.swing.*; import javax.swing.border.Border; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/CaseMenu.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/common/CaseMenu.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java index 964f5d8..db40676 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/CaseMenu.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/CaseMenu.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; import java.lang.reflect.Method; import java.util.NoSuchElementException; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/ErrorCode.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/common/ErrorCode.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java index efcdf78..b8151b2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/ErrorCode.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/ErrorCode.java @@ -1,6 +1,4 @@ -package com.zhehekeji.web.lib.common; - -import com.zhehekeji.web.lib.NetSDKLib; +package com.zhehekeji.web.lib.joyware.common; /** * 登录设备设备错误状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/EventTaskCommonQueue.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/common/EventTaskCommonQueue.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java index 2b32660..377e187 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/EventTaskCommonQueue.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskCommonQueue.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/EventTaskHandler.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java similarity index 60% rename from web/src/main/java/com/zhehekeji/web/lib/common/EventTaskHandler.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java index 5cb3b1a..fe25ba1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/EventTaskHandler.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/EventTaskHandler.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; public interface EventTaskHandler { diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/Res.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/common/Res.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java index 561e662..2e03a0e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/Res.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/Res.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.*; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.*; import java.util.Locale; import java.util.ResourceBundle; diff --git a/web/src/main/java/com/zhehekeji/web/lib/common/SavePath.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/SavePath.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/common/SavePath.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/common/SavePath.java index 5edb6b5..12f5bb6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/common/SavePath.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/common/SavePath.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.common; +package com.zhehekeji.web.lib.joyware.common; -import com.zhehekeji.web.lib.ToolKits; +import com.zhehekeji.web.lib.joyware.ToolKits; import java.io.File; diff --git a/web/src/main/java/com/zhehekeji/web/lib/constant/SDKStructureFieldLenth.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/constant/SDKStructureFieldLenth.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java index e3bd53b..6c638de 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/constant/SDKStructureFieldLenth.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDKStructureFieldLenth.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.constant; +package com.zhehekeji.web.lib.joyware.constant; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/constant/SDK_ALARM_Ex_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/constant/SDK_ALARM_Ex_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java index 8b93815..11d086a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/constant/SDK_ALARM_Ex_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/constant/SDK_ALARM_Ex_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.constant; +package com.zhehekeji.web.lib.joyware.constant; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; @@ -33,7 +33,7 @@ public class SDK_ALARM_Ex_TYPE { */ public static final int SDK_DISKERROR_ALARM_EX = 0x2107; /** - * 无硬盘报警,对应结构体{@link com.zhehekeji.web.lib.structure.ALARM_NO_DISK_INFO} + * 无硬盘报警,对应结构体{@link com.zhehekeji.web.lib.joyware.structure.ALARM_NO_DISK_INFO} * 对应的回调接口{@link NetSDKLib.fMessCallBack#invoke(int, NetSDKLib.LLong, Pointer, int, String, NativeLong, Pointer)} * 对应的接口{@link NetSDKLib#CLIENT_StartListenEx(NetSDKLib.LLong)} */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_ACCESS_PROPERTY_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_ACCESS_PROPERTY_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java index 7d6f4ec..b60cbb4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_ACCESS_PROPERTY_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_ACCESS_PROPERTY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java index 5cc0779..f2a2338 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_ASG_VOICE_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_BODY_TRAIT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_BODY_TRAIT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java index ade561c..200bc29 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_BODY_TRAIT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_BODY_TRAIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACEDETECT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACEDETECT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java index 9bd803f..d4d0490 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACEDETECT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACEDETECT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_SNAP_POLICY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_SNAP_POLICY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java index 15f103f..82284d9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_SNAP_POLICY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_SNAP_POLICY.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_TRAIT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_TRAIT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java index bf27bbd..8059121 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_FACE_TRAIT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_FACE_TRAIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java index e9d4098..1fc9ab8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_INSTANCE_SUBCLASS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_VOICE_ID.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_VOICE_ID.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java index 62edcd5..366036b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/CFG_EM_VOICE_ID.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/CFG_EM_VOICE_ID.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/DH_LOG_QUERY_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/DH_LOG_QUERY_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java index ec22dd9..f270d4b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/DH_LOG_QUERY_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/DH_LOG_QUERY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 日志查询类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EMDeviceType.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EMDeviceType.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java index bc77d70..f3faf5f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EMDeviceType.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EMDeviceType.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ACROSS_PARKING.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ACROSS_PARKING.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java index e6e39a8..20364cd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ACROSS_PARKING.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ACROSS_PARKING.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 是否跨位 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALARMOUT_POLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALARMOUT_POLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java index 8d1415f..4edc4b5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALARMOUT_POLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALARMOUT_POLE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALGORITHM_PARTITION_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALGORITHM_PARTITION_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java index 57e102c..0c1a245 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ALGORITHM_PARTITION_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ALGORITHM_PARTITION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ASG_WORK_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ASG_WORK_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java index e712069..bd6c8b1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ASG_WORK_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ASG_WORK_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java index 8c5b644..c846d37 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_SOURCE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java index a39d1ac..99500c4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_AUDIO_DATA_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_AUDIO_DATA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_EXIST_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_EXIST_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java index 5cadce7..e39b54e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_EXIST_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_EXIST_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_BATTERY_EXIST_STATE { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java index 1408bf8..407830d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_BATTERY_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_BATTERY_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_BATTERY_STATE { EM_BATTERY_STATE_UNKNOWN(0, "电量未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CALIBRATEAREA_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CALIBRATEAREA_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java index 54f6d1c..ef8bf2c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CALIBRATEAREA_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CALIBRATEAREA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAMERA_CONNECT_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAMERA_CONNECT_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java index af896a2..5e17cb5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAMERA_CONNECT_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAMERA_CONNECT_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAN_START_STREAM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAN_START_STREAM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java index b727c63..1d93ab9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAN_START_STREAM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAN_START_STREAM.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 拉流使能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java index 82c16e0..759ef69 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CAPTURE_PROCESS_END_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_CAPTURE_PROCESS_END_TYPE { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CFG_CAP_CMD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CFG_CAP_CMD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java index 59f4030..79a96d5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CFG_CAP_CMD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CFG_CAP_CMD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 命令类型,对应QueryNewSystemInfo接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CHANNEL_WIDTH.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CHANNEL_WIDTH.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java index 5909a92..fed2f73 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CHANNEL_WIDTH.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CHANNEL_WIDTH.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLECTIVITY_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLECTIVITY_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java index f740293..f1ae99b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLECTIVITY_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLECTIVITY_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLISION_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLISION_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java index 987961a..e8dde45 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COLLISION_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COLLISION_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java index c59a4d1..d8cc680 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COMPOSIT_CHANNEL_BIND_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 默认组合通道绑定模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java index b026d52..4fbe69d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSECOMPOSITE_OPERATE_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.structure.*; +import com.zhehekeji.web.lib.joyware.structure.*; /** * 录播主机组合通道操作 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSERECORD_OPERATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSERECORD_OPERATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java index b4cdf10..d026009 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSERECORD_OPERATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSERECORD_OPERATE_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.structure.*; +import com.zhehekeji.web.lib.joyware.structure.*; /** * 录播主机录像信息操作 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_LOCK_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_LOCK_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java index cd5be33..978801b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_LOCK_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_LOCK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 课程录像锁定类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java index 6de85f8..2ee458a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_COMPRESSION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 课程录像压缩类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java index 0cac5ca..0c5aa0f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_RECORD_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_RECORD_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 课程录像类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java index fb5a99a..a63f0af 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_COURSE_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_COURSE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 课程状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CURRENT_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CURRENT_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java index 13d816b..ccf47cd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CURRENT_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CURRENT_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_CURRENT_STATE_TYPE { EM_CURRENT_STATE_UNKNOWN(0, "电流状态未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java index f5d0b0a..ff8535d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_DEV_PROTOCOL_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java index 3a208b2..dc76bf0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_EDUCATION_VOICE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java index cd064e2..5bd137a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_CUSTOM_PASSWORD_ENCRYPTION_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * AccessControlCustomPassword记录集中密码的保存方式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DATA_SOURCE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DATA_SOURCE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java index ade5e8e..28cfda9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DATA_SOURCE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DATA_SOURCE_TYPE.java @@ -1,4 +1,6 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; + +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -8,11 +10,11 @@ package com.zhehekeji.web.lib.enumeration; */ public enum EM_DATA_SOURCE_TYPE { /** - * {@link com.zhehekeji.web.lib.NetSDKLib.NET_REMOTE_REALTIME_STREAM_INFO} + * {@link NetSDKLib.NET_REMOTE_REALTIME_STREAM_INFO} */ EM_DATA_SOURCE_REMOTE_REALTIME_STREAM(1, "远程实时流"), /** - * {@link com.zhehekeji.web.lib.NetSDKLib.NET_PUSH_PICFILE_INFO} + * {@link NetSDKLib.NET_PUSH_PICFILE_INFO} */ EM_DATA_SOURCE_PUSH_PICFILE(2, "主动推送图片文件"); private int type; diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DELIVERY_FILE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DELIVERY_FILE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java index 822d910..3ccb195 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DELIVERY_FILE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DELIVERY_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DETECT_SENSOR_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DETECT_SENSOR_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java index 7e58e9f..47b39ed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DETECT_SENSOR_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DETECT_SENSOR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 探测物体的传感器类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java index 80ceb95..36b0cd0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * className：EM_DEV_VARIABLE_CARS_MANAGER_FUNC_TYPE diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java index 5ae0c00..c44db3c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DIRECTION_AFTER_POWER_OFF.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISK_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISK_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java index 91309c5..3aa6fe1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISK_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java index a34eb1d..2fe7691 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DISPLAY_CAMERA_ANGLE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_DATA_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_DATA_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java index 2392d98..36723a6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_DATA_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_DATA_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 下载数据类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_FILE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_FILE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java index c37f6a2..59928a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_FILE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 下载文件方式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_TIME_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_TIME_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java index a7a6ddc..d7799fa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DOWNLOAD_TIME_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DOWNLOAD_TIME_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 下载时间类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DRIVING_DIRECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DRIVING_DIRECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java index c6895e4..137f1ff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_DRIVING_DIRECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_DRIVING_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_DRIVING_DIRECTION { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EMERGENCYSTATUS_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EMERGENCYSTATUS_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java index 900dc89..ddd7b4c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EMERGENCYSTATUS_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EMERGENCYSTATUS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_DIRECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_DIRECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java index b08a4a2..91e3a07 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_DIRECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java index 8882797..aa51025 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_ENTRY_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_ENTRY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java index d984fcd..2234bd0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 智能分析事件类型枚举类 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java index a2c3f32..00b8729 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_IVS_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_IVS_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Callback; import com.sun.jna.Pointer; @@ -8,7 +8,7 @@ import com.sun.jna.Pointer; * @author 47081 * @version 1.0 * @description 智能分析事件类型 - * 对应接口{@link com.zhehekeji.web.lib.NetSDKLib#CLIENT_RealLoadPictureEx(NetSDKLib.LLong, int, int, int, Callback, Pointer, Pointer)} + * 对应接口{@link NetSDKLib#CLIENT_RealLoadPictureEx(NetSDKLib.LLong, int, int, int, Callback, Pointer, Pointer)} * @date 2020/10/14 */ public enum EM_EVENT_IVS_TYPE { @@ -356,7 +356,7 @@ public enum EM_EVENT_IVS_TYPE { */ EVENT_IVS_TRAFFIC_DRIVER_CALLING(0x0000013A, "驾驶员打电话事件"), /** - * {@link com.zhehekeji.web.lib.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO} + * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO} */ EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT(0x0000013B, "行人闯红灯事件"), /** @@ -653,13 +653,13 @@ public enum EM_EVENT_IVS_TYPE { EVENT_IVS_ANIMAL_DETECTION(0x00000286, "动物检测事件"), // ,(对应 DEV_EVENT_ANIMAL_DETECTION_INFO) /** - * {@link com.zhehekeji.web.lib.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO} + * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_SHOP_WINDOW_POST_INFO} */ EVENT_IVS_SHOP_WINDOW_POST(0x00000287, "橱窗张贴事件"), /** * (对应 DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO) - * {@link com.zhehekeji.web.lib.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO} + * {@link com.zhehekeji.web.lib.joyware.structure.DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO} */ EVENT_IVS_SHOP_SIGN_ABNORMAL(0x00000288, "店招异常事件"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java index 0ef19ef..eea0852 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_EVENT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_EVENT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * className：EM_EVENT_TYPE diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FEATURE_LIST_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FEATURE_LIST_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java index d6dc8f8..792f0f4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FEATURE_LIST_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FEATURE_LIST_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java index 42247d8..68afdeb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILTER_IMAGE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILTER_IMAGE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java index 7fbbbf3..d116a92 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FILTER_IMAGE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FILTER_IMAGE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java index c8c7c41..9bb9dd1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FOLLOW_CAR_ALARM_IMAGE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FORBID_PARKING_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FORBID_PARKING_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java index 5ef8b03..0d4da39 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_FORBID_PARKING_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_FORBID_PARKING_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 禁停状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_GATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_GATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java index ec40cbd..fca4154 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_GATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_GATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_HEATMAP_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_HEATMAP_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java index 62ad3a9..78b77e7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_HEATMAP_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_HEATMAP_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IPC_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IPC_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java index 107cfd1..827371b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IPC_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IPC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * IPC类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IS_RECORD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IS_RECORD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java index dd1ef51..3e86ab8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_IS_RECORD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_IS_RECORD.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 录像使能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_LINE_COLOR_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_LINE_COLOR_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java index 3692107..6f4bf89 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_LINE_COLOR_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_LINE_COLOR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java index 4c8d8d5..60f2965 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_MIX_SNAP_SPEED_SOURCE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_CONFIG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_CONFIG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java index 8193fb2..a3f0081 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_CONFIG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.ptr.IntByReference; /** @@ -118,13 +118,13 @@ public enum EM_NEW_CONFIG { CFG_CMD_PICINPIC("PicInPic"), /** 空闲动作配置(CFG_IDLE_MOTION_INFO) */ CFG_CMD_IDLEMOTION_INFO("IdleMotion"), - /** 语音激励(对应 {@link com.zhehekeji.web.lib.structure.CFG_AUDIO_SPIRIT}) */ + /** 语音激励(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_AUDIO_SPIRIT}) */ CFG_CMD_AUDIO_SPIRIT("AudioSpirit"), - /** 设备安装位置的GPS坐标信息(对应 {@link com.zhehekeji.web.lib.structure.CFG_DEVLOCATION_INFO}) */ + /** 设备安装位置的GPS坐标信息(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_DEVLOCATION_INFO}) */ CFG_CMD_DEVLOCATION("DevLocation"), - /** 设备参数标定配置(对应 {@link com.zhehekeji.web.lib.structure.CFG_LOCATION_CALIBRATE_INFO}) */ + /** 设备参数标定配置(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_LOCATION_CALIBRATE_INFO}) */ CFG_CMD_LOCATION_CALIBRATE("LocationCalibrate"), - /** // 门禁基本配置(对应 {@link com.zhehekeji.web.lib.structure.CFG_ACCESS_GENERAL_INFO}) */ + /** // 门禁基本配置(对应 {@link com.zhehekeji.web.lib.joyware.structure.CFG_ACCESS_GENERAL_INFO}) */ CFG_CMD_ACCESS_GENERAL("AccessControlGeneral"), /** * // 无线网络连接设置(对应 CFG_WIRELESS_INFO) diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java index 1f01c91..dd43c25 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_NEW_QUERY_SYSTEM_INFO.java @@ -1,18 +1,18 @@ -package com.zhehekeji.web.lib.enumeration;/** +package com.zhehekeji.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.ptr.IntByReference; /** * @author 47081 * @version 1.0 * @description 能力集命令枚举, 对应接口 - * {@link com.zhehekeji.web.lib.NetSDKLib#CLIENT_QueryNewSystemInfo(NetSDKLib.LLong, String, int, byte[], int, IntByReference, int)} + * {@link NetSDKLib#CLIENT_QueryNewSystemInfo(NetSDKLib.LLong, String, int, byte[], int, IntByReference, int)} * @date 2020/11/9 */ public enum EM_NEW_QUERY_SYSTEM_INFO { @@ -130,7 +130,7 @@ public enum EM_NEW_QUERY_SYSTEM_INFO { CFG_CAP_CMD_BURN_MANAGER("BurnManager.getCaps"), /** * 获取云台能力集 - * 对应结构体{@link com.zhehekeji.web.lib.structure.CFG_PTZ_PROTOCOL_CAPS_INFO} + * 对应结构体{@link com.zhehekeji.web.lib.joyware.structure.CFG_PTZ_PROTOCOL_CAPS_INFO} */ CFG_CAP_CMD_PTZ("ptz.getCurrentProtocolCaps"), /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_OPEN_STROBE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_OPEN_STROBE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java index 18bf5ca..55c4e1a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_OPEN_STROBE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_OPEN_STROBE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_DIRECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_DIRECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java index b5f4a38..2392180 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_DIRECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 停车方向 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java index 2034041..333726b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKINGSPACE_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKINGSPACE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 车位状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKING_TRIGGER_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKING_TRIGGER_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java index 55e930b..82ad36f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARKING_TRIGGER_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARKING_TRIGGER_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 车位抓拍触发类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARTITION_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARTITION_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java index 3bfc8b2..4fc5a19 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PARTITION_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PARTITION_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java index e767bad..47bb456 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java index dd0937f..e4c92be 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASSERBY_DB_OVERWRITE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASS_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASS_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java index 67fb3c8..b1acc9b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PASS_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PASS_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAYAUDIO_PRIORITY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAYAUDIO_PRIORITY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java index 5406853..d049b14 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAYAUDIO_PRIORITY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAYAUDIO_PRIORITY.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAY_WITH_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAY_WITH_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java index 637561d..dd25a29 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PLAY_WITH_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PLAY_WITH_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PRIVACY_MASK_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PRIVACY_MASK_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java index 18e78e5..cac8002 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PRIVACY_MASK_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PRIVACY_MASK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java index 4d2b112..3ae8b20 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_PTZ_UNSUPPORT_DIRECTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 * @description 云台不支持的转动方向 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_IS_EXPIRED.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_IS_EXPIRED.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java index 8dcc0b4..6860a3d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_IS_EXPIRED.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_IS_EXPIRED.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java index 9a02d75..0ac8fe0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QRCODE_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QRCODE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QUERY_TEMPERATURE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QUERY_TEMPERATURE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java index a2775cf..d006a45 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_QUERY_TEMPERATURE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_QUERY_TEMPERATURE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_OBJECTTYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_OBJECTTYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java index 6713e3a..cff14d3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_OBJECTTYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_OBJECTTYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_RADAR_OBJECTTYPE { EM_RADAR_OBJECTTYPE_UNKNOWN(0,"未识别目标"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_POINTTYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_POINTTYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java index d72a67c..90ec2e5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RADAR_POINTTYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RADAR_POINTTYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_RADAR_POINTTYPE { EM_RADAR_POINTTYPE_UNKNOWN(0,"未知"), diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERROR.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERROR.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java index 13378ed..672a6d3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERROR.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERROR.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_RAID_ERROR { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERR_SUBDISK.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERR_SUBDISK.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java index 7d3cf7e..c737e61 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RAID_ERR_SUBDISK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RAID_ERR_SUBDISK.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_RAID_ERR_SUBDISK { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_REASON_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_REASON_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java index bc44189..39db815 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_REASON_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_REASON_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RELAY_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RELAY_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java index 4e019bb..e20493e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_RELAY_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_RELAY_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SCENE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SCENE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java index a76d7c8..9f744ab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SCENE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SCENE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SDK_LOG_QUERY_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SDK_LOG_QUERY_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java index 0e007bf..6b9e385 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SDK_LOG_QUERY_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SDK_LOG_QUERY_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 日志查询类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_ENCRYPT_FLAG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_ENCRYPT_FLAG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java index 5f3f416..acecadc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_ENCRYPT_FLAG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_ENCRYPT_FLAG.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_LOCK_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_LOCK_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java index 8c74c03..ce48ea2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SD_LOCK_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SD_LOCK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SEND_SEARCH_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SEND_SEARCH_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java index c2f4a82..1f50f36 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SEND_SEARCH_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SEND_SEARCH_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_SEND_SEARCH_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SIGNLIGHT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SIGNLIGHT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java index 1ac1dce..b38858d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SIGNLIGHT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SIGNLIGHT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java index 0db07b9..36757e9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOLARCELL_SYSTEM_FAULT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOURCE_VIDEO_LOCATION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOURCE_VIDEO_LOCATION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java index 88b6f37..cb67e05 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SOURCE_VIDEO_LOCATION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SOURCE_VIDEO_LOCATION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STARTUP_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STARTUP_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java index 6487f92..6f64247 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STARTUP_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STARTUP_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DEVICE_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DEVICE_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java index 8fa2992..2201285 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DEVICE_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DEVICE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_POWERMODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_POWERMODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java index ed9f3eb..d4b8ac3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_POWERMODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_POWERMODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public class EM_STORAGE_DISK_POWERMODE { public static final int EM_STORAGE_DISK_POWERMODE_UNKNOWN = 0; // UNKnown状态（不是以下状态中的值） diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java index 3ddbb86..a3f79af 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_DISK_PREDISKCHECK.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public class EM_STORAGE_DISK_PREDISKCHECK { public static final int EM_STORAGE_DISK_PREDISKCHECK_UNKNOWN = 0; // UnKnown状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_HEALTH_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_HEALTH_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java index d0b2890..f6fbb6a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_HEALTH_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_HEALTH_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_PACKET_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_PACKET_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java index ac6403f..f2c4eca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_STORAGE_PACKET_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_STORAGE_PACKET_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration;/** +package com.zhehekeji.web.lib.joyware.enumeration;/** * @author 47081 * @description * @date 2021/2/20 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUBCLASSID_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUBCLASSID_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java index 561e373..739c12d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUBCLASSID_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUBCLASSID_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java index efc8ea2..08e37c7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTED_COLOR_LIST_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTFINGERPRINT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTFINGERPRINT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java index ef571bb..1929ae0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORTFINGERPRINT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORTFINGERPRINT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 是否支持指纹功能 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java index a5fbe61..e51da05 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_CLOSE_UP_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java index 7427ba3..a16f3dd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_CHECK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_SUPPORT_FAST_CHECK_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java index d57f946..3d7c9c5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FAST_IMPORT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_SUPPORT_FAST_IMPORT_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FOCUS_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FOCUS_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java index 1b91b0b..2400aa2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_SUPPORT_FOCUS_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_SUPPORT_FOCUS_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration;/** +package com.zhehekeji.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TALK_AUDIO_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TALK_AUDIO_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java index 0eb0acc..27477f8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TALK_AUDIO_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TALK_AUDIO_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 音频编码压缩格式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TAMPERALTERSTATUS_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TAMPERALTERSTATUS_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java index 4f12b18..e94b21d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TAMPERALTERSTATUS_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TAMPERALTERSTATUS_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFICSTROBE_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFICSTROBE_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java index 38c103a..fd03065 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFICSTROBE_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFICSTROBE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_FLOW_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_FLOW_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java index e7addfd..53a6dc4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_FLOW_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_FLOW_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 流量状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java index 810e9a5..175782e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_LIGHT_DETECT_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java index e0276a8..896f0d8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_DEVICE_WORK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java index 71bae30..3a2fb09 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_GROUND_SENSE_IN_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java index 4809217..8321aae 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_COIL_MATCH_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java index ab6369d..b5d564c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_RADAR_DETECT_CAR_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java index 5b9131a..c9fee05 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_ACTION_REASON_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java index b620814..34b4aa5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_FAULT_CODE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java index 2d79158..4d5dc4c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_IN_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java index de0c72a..6d1d97b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RAIL_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java index 4607647..5306013 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRAFFIC_SNAP_STROBE_RUN_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java index 19c5fc6..ac5e0ff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_SOURCE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 红绿灯触发源 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java index cdf7560..0e1d148 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRFAFFIC_LIGHT_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 交通灯类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRIGGER_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRIGGER_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java index 522065e..8d0ceb5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_TRIGGER_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_TRIGGER_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UNIFORM_STYLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UNIFORM_STYLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java index b3b38b9..0c2511f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UNIFORM_STYLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UNIFORM_STYLE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 制服样式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UPLOAD_FLAG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UPLOAD_FLAG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java index 170a0c1..6dead75 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_UPLOAD_FLAG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_UPLOAD_FLAG.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java index d27b53b..3612656 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLEINOUT_CAR_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 车辆类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLE_TYPE_SPLIT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLE_TYPE_SPLIT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java index e63a725..be7bd82 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VEHICLE_TYPE_SPLIT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VEHICLE_TYPE_SPLIT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java index 9ab4bf8..4dd3227 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEODIAGNOSIS_TASK_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java index 973bc1e..b94f76d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEOINPUTS_SERVICE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 服务类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_FILE_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_FILE_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java index 58f0659..7ba5d82 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_FILE_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_FILE_STATE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java index d0e9506..2d74479 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIDEO_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIDEO_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java index 191a24f..88ced15 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VIRTUAL_COIL_OCCUPANCY_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 虚拟线圈占用状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VOLTAGE_STATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VOLTAGE_STATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java index 88ecba5..5ceada3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_VOLTAGE_STATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_VOLTAGE_STATE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum EM_VOLTAGE_STATE_TYPE { EM_VOLTAGE_STATE_UNKNOWN(1,"电压状态未知"), // 未知 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java index c9e35a6..802d32e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/EM_WLAN_SCAN_AND_CONFIG_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/ENUMERROR.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java similarity index 99% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/ENUMERROR.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java index 6649fed..f21e82b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/ENUMERROR.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ACCESS_ERRORCODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ACCESS_ERRORCODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java index e0930b4..e4e2018 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ACCESS_ERRORCODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ACCESS_ERRORCODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java index 1161392..c836c6b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_COURSECOMPOSITE_MODE_OPERATE_TYPE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.structure.*; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.structure.*; /** * {@link NetSDKLib#CLIENT_OperateCourseCompositeChannelMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_2DCODE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_2DCODE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java index 1b7eca1..a026818 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_2DCODE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_2DCODE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java index 873d636..99a64b8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_CFG_OPERATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_CFG_OPERATE_TYPE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; -import com.zhehekeji.web.lib.structure.NET_CFG_HEALTH_CODE_INFO; +import com.zhehekeji.web.lib.joyware.structure.NET_CFG_HEALTH_CODE_INFO; /** * 枚举值, @@ -90,11 +90,11 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ENCODE_PLAN = 1400; // 刻录光盘编码计划, 对应结构体 NET_ENCODE_PLAN_INFO public static final int NET_EM_CFG_COMPOSE_PLAN = 1403; // 合成通道的预案分割配置, 对应结构体 NET_COMPOSE_PLAN_INFO /** - * 合成通道配置, 对应结构体{@link com.zhehekeji.web.lib.structure.NET_COMPOSE_CHANNEL_INFO} + * 合成通道配置, 对应结构体{@link com.zhehekeji.web.lib.joyware.structure.NET_COMPOSE_CHANNEL_INFO} */ public static final int NET_EM_CFG_COMPOSE_CHANNEL = 1401; /** - * 司法刻录参数, 对应结构体 {@link com.zhehekeji.web.lib.structure.NET_BURN_PARAM_INFO} + * 司法刻录参数, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_BURN_PARAM_INFO} */ public static final int NET_EM_CFG_BURN_PARAM = 1402; /**********报警网关相关配置**************************************************************************************/ @@ -164,7 +164,7 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ACCESSCTL_BLACKLIST = 3900; // 门禁黑名单报警配置，对应结构体 NET_CFG_ACCESSCTL_BLACKLIST public static final int NET_EM_CFG_ACCESSCTL_BLACKLIST_LINK = 3901; // 门禁黑名单报警联动配置,对应结构体 NET_CFG_ALARM_MSG_HANDLE /** - * 门禁节假日组配置, 对应结构体 {@link com.zhehekeji.web.lib.structure.NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO} + * 门禁节假日组配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO} */ public static final int NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP = 3902; /** @@ -177,11 +177,11 @@ public class NET_EM_CFG_OPERATE_TYPE { public static final int NET_EM_CFG_ACCESSCTL_AUTH_MODE = 3904; public static final int NET_EM_CFG_ACS_FACE_RECOGNITION_SCHEME = 3905; // 门禁人脸识别相关配置,对应结构体 NET_CFG_ACS_FACE_RECOGNITION_SCHEME /** - * 广告禁用时段配置, 对应结构体 {@link com.zhehekeji.web.lib.structure.NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1 + * 广告禁用时段配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_FORBIDDEN_ADVERT_PLAY}, 通道无关，通道号填-1 */ public static final int NET_EM_CFG_FORBIDDEN_ADVERT_PLAY = 3906; /** - * 门禁设备当前模式配置, 对应结构体 {@link com.zhehekeji.web.lib.structure.NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1 + * 门禁设备当前模式配置, 对应结构体 {@link com.zhehekeji.web.lib.joyware.structure.NET_CFG_BGY_CUSTOMERCFG}, 通道无关，通道号填-1 */ public static final int NET_EM_CFG_BGY_CUSTOMERCFG = 3907; public static final int NET_EM_CFG_ACCESSCTL_KEYBINDINGINFOCFG = 3908; // 不同数字按钮对应的信息配置, 对应结构体 NET_CFG_ACCESSCTL_KEYBINDINGINFOCFG, 通道无关，通道号填-1 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_LOGIC_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_LOGIC_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java index 1131b0b..5c99af3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_LOGIC_CHANNEL.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 逻辑通道号 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MASK_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MASK_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java index e138c45..e228639 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MASK_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MASK_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration;/** +package com.zhehekeji.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MOSAIC_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MOSAIC_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java index ae5ffaa..dea8706 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_MOSAIC_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_MOSAIC_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration;/** +package com.zhehekeji.web.lib.joyware.enumeration;/** * @author 47081 * @descriptio * @date 2020/11/9 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_OFFLINE_CALL_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_OFFLINE_CALL_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java index 5eb0e90..356c4cb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_OFFLINE_CALL_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_OFFLINE_CALL_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_RECORD_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_RECORD_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java index 3b87e13..fc6b916 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_RECORD_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_RECORD_MODE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 录像模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_SHAPE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_SHAPE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java index 085fd46..c6aaff8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_EM_SHAPE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_EM_SHAPE_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 景物形状 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java index 3ed9c0d..f8daa4f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_ENUM_INPUT_CHANNEL_MEDIA.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 输入媒体介质 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_MONITORWALL_OPERATE_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_MONITORWALL_OPERATE_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java index de657a8..03d6a29 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_MONITORWALL_OPERATE_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_MONITORWALL_OPERATE_TYPE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.structure.*; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.structure.*; /** * 电视墙操作类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_ALARMCONTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_ALARMCONTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java index 6c1bb8d..34f538a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_ALARMCONTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_ALARMCONTION.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public enum NET_RADIOMETRY_ALARMCONTION { diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java index dc43830..929fb39 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_RADIOMETRY_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_RADIOMETRY_RESULT.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 热成像测温点报警结果值类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_TRAFFIC_LIGHT_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_TRAFFIC_LIGHT_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java index da76e74..c2774cc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_TRAFFIC_LIGHT_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_TRAFFIC_LIGHT_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; /** * 信号灯指示状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_VOLUME_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_VOLUME_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java index 0ffe176..59738a7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/enumeration/NET_VOLUME_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/NET_VOLUME_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.enumeration; +package com.zhehekeji.web.lib.joyware.enumeration; public class NET_VOLUME_TYPE { public static final int VOLUME_TYPE_ALL = 0; //所有卷 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java index d3ac031..712a31f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_CITIZEN_PICTURE_COMPARE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.*; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; /** * 普通报警事件 -> 人证比对事件 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_FIRE_DETECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_FIRE_DETECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java index 8da5e1a..a24c600 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_FIRE_DETECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_FIRE_DETECTION_INFO.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; /** * @author 251823 * @description 火警事件 (DH_ALARM_FIRE_DETECTION) * @date 2020/12/21 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class ALARM_FIRE_DETECTION_INFO extends NetSDKLib.SdkStructure{ diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_HEATIMG_TEMPER_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_HEATIMG_TEMPER_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java index 1092bb3..44dea2c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_HEATIMG_TEMPER_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_HEATIMG_TEMPER_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_RADIOMETRY_ALARMCONTION; -import com.zhehekeji.web.lib.enumeration.NET_RADIOMETRY_RESULT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_RADIOMETRY_ALARMCONTION; +import com.zhehekeji.web.lib.joyware.enumeration.NET_RADIOMETRY_RESULT; /** * 热成像测温点温度异常报警事件(对应结构体 {@link NetSDKLib#NET_ALARM_HEATIMG_TEMPER}) diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_NO_DISK_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_NO_DISK_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java index 6997e9b..64027d4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_NO_DISK_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_NO_DISK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_RAID_INFO_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_RAID_INFO_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java index 0ced186..f1e68d1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_RAID_INFO_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_RAID_INFO_EX.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_RAID_DEVICE_NAME; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_RAID_DEVICE_NAME; /** * className：ALARM_RAID_INFO_EX diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java index eb92768..40b8926 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_NO_ENTRY_RECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Callback; import com.sun.jna.Pointer; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java index 9166ff2..f31c93a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_REGION_PARKING_TIMEOUT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 事件类型 NET_ALARM_REGION_PARKING_TIMEOUT(区间车位停车超时) diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_SOLARCELL_SYSTEM_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_SOLARCELL_SYSTEM_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java index 64eb548..f76d6ab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_SOLARCELL_SYSTEM_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_SOLARCELL_SYSTEM_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_SOLARCELL_SYSTEM_FAULT_TYPE; -import com.zhehekeji.web.lib.constant.SDK_ALARM_Ex_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_SOLARCELL_SYSTEM_FAULT_TYPE; +import com.zhehekeji.web.lib.joyware.constant.SDK_ALARM_Ex_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFICSTROBESTATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFICSTROBESTATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java index 75d690c..d38cb41 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFICSTROBESTATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFICSTROBESTATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java index 1ce0b98..9807599 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_TRAFFIC_LIGHT_STATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_TRFAFFIC_LIGHT_SOURCE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_SOURCE; /** * (交通灯事件)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_VEHICLE_INOUT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_VEHICLE_INOUT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java index 173709a..f6f7c42 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ALARM_VEHICLE_INOUT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ALARM_VEHICLE_INOUT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java index 28b56c1..19e060d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ANATOMY_TEMP_DETECT_PERSON_FILTER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java index 512a74e..06fa85f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/AV_CFG_MONITOR_WALL_OUT_MODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/Auxs.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java similarity index 56% rename from web/src/main/java/com/zhehekeji/web/lib/structure/Auxs.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java index 82ce258..d830c11 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/Auxs.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Auxs.java @@ -1,13 +1,13 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_DOOR_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_DOOR_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java index c901049..386b866 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_DOOR_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_DOOR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java index 538384f..05ba870 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ABLOCK_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ABLOCK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_CONTROL_ASG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_CONTROL_ASG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java index fd7c406..549c1f9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_CONTROL_ASG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_CONTROL_ASG.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.*; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.*; /** * @author 47081 @@ -10,7 +10,7 @@ import com.zhehekeji.web.lib.enumeration.*; * @date 2021/2/7 */ public class CFG_ACCESS_CONTROL_ASG extends NetSDKLib.SdkStructure { - /** 通行模式,{@link com.zhehekeji.web.lib.enumeration.EM_PASS_MODE} */ + /** 通行模式,{@link com.zhehekeji.web.lib.joyware.enumeration.EM_PASS_MODE} */ public int emPassMode; /** 开门速度档位, 范围:0-7,对应1-8档 */ public int nOpenDoorSpeed; @@ -28,7 +28,7 @@ public class CFG_ACCESS_CONTROL_ASG extends NetSDKLib.SdkStructure { public int emCollisionMode; /** 设备音量等级共8档, 范围:0-7, 0级表示静音 */ public int nVolumeLevel; - /** 闸机断电以后门摆动放向,{@link com.zhehekeji.web.lib.enumeration.EM_DIRECTION_AFTER_POWER_OFF} */ + /** 闸机断电以后门摆动放向,{@link com.zhehekeji.web.lib.joyware.enumeration.EM_DIRECTION_AFTER_POWER_OFF} */ public int emDirectionAfterPowerOff; /** 工作模式,{@link EM_ASG_WORK_MODE} */ public int emWorkMode; // 工作模式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_GENERAL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_GENERAL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java index 28aad6c..a4f2548 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_GENERAL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_GENERAL_INFO.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Arrays; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_ADDRESS_LEN; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_PASSWORD_LEN; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_ADDRESS_LEN; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PASSWORD_LEN; /** * @author 47081 @@ -39,7 +39,7 @@ public class CFG_ACCESS_GENERAL_INFO extends NetSDKLib.SdkStructure { /** 工程密码 */ public byte[] szProjectPassword = new byte[MAX_PASSWORD_LEN]; - /** 门禁通道单双向配置,对应枚举{@link com.zhehekeji.web.lib.enumeration.CFG_ACCESS_PROPERTY_TYPE} */ + /** 门禁通道单双向配置,对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.CFG_ACCESS_PROPERTY_TYPE} */ public int emAccessProperty; /** AB互锁信息 */ public CFG_ABLOCK_INFO stuABLockInfo; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java index f0435b7..708c11d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.CFG_EM_VOICE_ID; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java index 3298016..61cee98 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACCESS_VOICE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACCESS_VOICE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.CFG_EM_ASG_VOICE_DIRECTION; -import com.zhehekeji.web.lib.enumeration.CFG_EM_VOICE_ID; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_ASG_VOICE_DIRECTION; +import com.zhehekeji.web.lib.joyware.enumeration.CFG_EM_VOICE_ID; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACTIVITY_ANALYSE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACTIVITY_ANALYSE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java index 6e9ad13..ac15a3c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ACTIVITY_ANALYSE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ACTIVITY_ANALYSE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java index 18c8a89..3fb1568 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_DETECT_SCENE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java index 87bcede..1ecf2ca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_ANATOMYTEMP_VISUAL_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java index 3f9734d..1b2ca74 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java index 8b60bf7..a2a183a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_CHANNEL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_LINKAGE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_LINKAGE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java index 7d7723a..e3ae135 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_AUDIO_SPIRIT_LINKAGE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_AUDIO_SPIRIT_LINKAGE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.CFG_MAX_LOWER_MATRIX_OUTPUT; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_MAX_LOWER_MATRIX_OUTPUT; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java index cd2eafe..32b7af7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java index 28657f9..3d59ec9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java index 9e97d54..74059d0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CALIBRATE_UNIT_INFO_ARR.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java index 8aa11f2..a532806 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO_OPT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO_OPT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java index ac091c8..cf945c3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_INFO_OPT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_INFO_OPT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 视频分析能力集 简化结构体,用于查询IPC是否有人脸识别能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java index 69677dd..91c545b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_ANALYSE_REQ_EXTEND_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_CELIBRATE_AREA.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_CELIBRATE_AREA.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java index afcf6e5..507badf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_CELIBRATE_AREA.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_CELIBRATE_AREA.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_SCENE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java similarity index 98% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_SCENE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java index 7e6a75d..8f93190 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_CAP_SCENE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_CAP_SCENE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 场景能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java index 25d5dfb..03fdbe4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETAIL_DRIVEASSISTANT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETECT_REGIONS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETECT_REGIONS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java index 56ef8fe..aed5af1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DETECT_REGIONS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DETECT_REGIONS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DEVLOCATION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DEVLOCATION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java index bea43fe..866c891 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_DEVLOCATION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_DEVLOCATION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 设备安装位置的GPS坐标信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_HIGH_TOSS_DETECT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_HIGH_TOSS_DETECT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java index e4c4605..19822ff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_HIGH_TOSS_DETECT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_HIGH_TOSS_DETECT_INFO.java @@ -1,10 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.constant.SDKStructureFieldLenth; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_NAME_LEN; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.*; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.*; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LINK_CLASS_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LINK_CLASS_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java index fd7b1bf..f0779a9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LINK_CLASS_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LINK_CLASS_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 联动业务大类选项 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java index 7acf547..99b5807 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.constant.SDKStructureFieldLenth; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java index 30336c4..8a75804 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_LOCATION_CALIBRATE_POINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_MANNUMDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_MANNUMDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java index cc46438..15f8d03 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_MANNUMDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_MANNUMDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_MULT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_MULT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java index 406ed13..6425306 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_MULT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_MULT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java index e2d2c89..299cb82 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBERSTAT_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBERSTAT_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBER_STAT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBER_STAT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java index 3b92066..b25bca2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_NUMBER_STAT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_NUMBER_STAT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 人数统计大类场景 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ABSOLUTELY_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ABSOLUTELY_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java index 6cad830..6b94c9c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ABSOLUTELY_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ABSOLUTELY_CAPS.java @@ -1,13 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; - -import java.util.Arrays; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ACTION_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ACTION_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java index add8985..bf84d61 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_ACTION_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_ACTION_CAPS.java @@ -1,13 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; - -import java.util.Arrays; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_AREA_SCAN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_AREA_SCAN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java index 5bcc46f..1ecbf42 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_AREA_SCAN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_AREA_SCAN.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java index c6ec0d8..eca5f93 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_CONTINUOUSLY_TYPE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_LIGHTING_CONTROL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_LIGHTING_CONTROL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java index e668e1e..4ae06c7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_LIGHTING_CONTROL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_LIGHTING_CONTROL.java @@ -1,13 +1,13 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.CFG_COMMON_STRING_32; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MEASURE_DISTANCE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MEASURE_DISTANCE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java index 2966645..11e114e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MEASURE_DISTANCE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MEASURE_DISTANCE.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOTION_RANGE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOTION_RANGE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java index 909a1bd..7cbdbac 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOTION_RANGE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOTION_RANGE.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java index f066de8..8ca39b7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_ABSOLUTELY_CAP.java @@ -1,11 +1,11 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java index 6735e92..d553432 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_MOVE_CONTINUOUSLY_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PRIVACY_MASKING.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PRIVACY_MASKING.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java index 3d99c25..a5d4c8d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PRIVACY_MASKING.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PRIVACY_MASKING.java @@ -1,14 +1,14 @@ -package com.zhehekeji.web.lib.structure;/** +package com.zhehekeji.web.lib.joyware.structure;/** * @author 47081 * @descriptio * @date 2020/11/9 * @version 1.0 */ -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_MASKTYPE_COUNT; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_MOSAICTYPE_COUNT; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MASKTYPE_COUNT; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_MOSAICTYPE_COUNT; /** * @author 47081 @@ -35,7 +35,7 @@ public class CFG_PTZ_PRIVACY_MASKING extends NetSDKLib.SdkStructure { public int nMaskTypeCount; /** * 支持的遮挡块形状，没有该项配置时默认支持矩形 - * 枚举参考{@link com.zhehekeji.web.lib.enumeration.NET_EM_MASK_TYPE} + * 枚举参考{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_MASK_TYPE} */ public int[] emMaskType = new int[MAX_MASKTYPE_COUNT]; /** @@ -56,7 +56,7 @@ public class CFG_PTZ_PRIVACY_MASKING extends NetSDKLib.SdkStructure { public int nMosaicTypeCount; /** * 支持的马赛克类型(SetMosaicSupport为true时该能力有效，没有该项配置时默认支持24x24大小马赛克) - * 枚举值参考{@link com.zhehekeji.web.lib.enumeration.NET_EM_MOSAIC_TYPE} + * 枚举值参考{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_MOSAIC_TYPE} */ public int[] emMosaicType = new int[MAX_MOSAICTYPE_COUNT]; } diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java index c712ae0..423495d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_PTZ_PROTOCOL_CAPS_INFO.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.CFG_COMMON_STRING_32; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_PROTOCOL_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.CFG_COMMON_STRING_32; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_PROTOCOL_NAME_LEN; /** * @author 47081 @@ -215,7 +215,7 @@ public class CFG_PTZ_PROTOCOL_CAPS_INFO extends NetSDKLib.SdkStructure { public int dwSupportViewRangeType; /** - * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link com.zhehekeji.web.lib.enumeration.EM_SUPPORT_FOCUS_MODE} + * 支持的支持的焦距模式掩码,从低位到高位依次数,见{@link com.zhehekeji.web.lib.joyware.enumeration.EM_SUPPORT_FOCUS_MODE} */ public int dwSupportFocusMode; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_QUEUEDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_QUEUEDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java index 62511ea..94ad598 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_QUEUEDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_QUEUEDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java index 87405e9..7396f5e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_STEREO_BEHAVIOR_SCENE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_COMP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_COMP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java index 74b4e75..ab9e7eb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_COMP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_COMP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_RULES_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_RULES_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java index 4f94c07..fd3b3f2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_SUPPORTED_RULES_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_SUPPORTED_RULES_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 支持的规则 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_THERMO_GAIN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_THERMO_GAIN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java index 0541981..29eb4a5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_THERMO_GAIN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_THERMO_GAIN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VACAP_SUPPORTEDSCENES.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VACAP_SUPPORTEDSCENES.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java index 9464a0c..1980c0c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VACAP_SUPPORTEDSCENES.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VACAP_SUPPORTEDSCENES.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java index 40a7c47..f6db355 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_AVAILABILITY_DETECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java index 2a0b3fa..a3f5e1e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CFG_VIDEO_SNOWFLAKE_DETECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CROWD_CALIBRATION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CROWD_CALIBRATION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java index 8b01440..91b027a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CROWD_CALIBRATION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CROWD_CALIBRATION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/CUSTOM_PERSON_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/structure/CUSTOM_PERSON_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java index 70de5c3..29ea43c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/CUSTOM_PERSON_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/CUSTOM_PERSON_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.DH_MAX_PERSON_INFO_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.DH_MAX_PERSON_INFO_LEN; /** * className：CUSTOM_PERSON_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_DAHUA_RADAR_CONFIG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_DAHUA_RADAR_CONFIG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java index 03bb693..57e395b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_DAHUA_RADAR_CONFIG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_DAHUA_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：DEV_DAHUA_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java index 0d3f46f..f344c54 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_TRIGGER_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java index eafee18..62c119b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_IN_OUT_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_DRIVING_DIRECTION; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_DRIVING_DIRECTION; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java index 2a2833a..0de2373 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_CAR_DRIVING_OUT_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_CAPTURE_PROCESS_END_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_TRIGGER_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_CAPTURE_PROCESS_END_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_TRIGGER_TYPE; /** * 事件类型 EVENT_IVS_CAR_DRIVING_OUT(车辆驶出事件)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DENSITYDETECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DENSITYDETECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java index bfc1dac..f87ff52 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DENSITYDETECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DENSITYDETECTION_INFO.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.DH_MSG_OBJECT; -import com.zhehekeji.web.lib.NetSDKLib.DH_POINT; -import com.zhehekeji.web.lib.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.NetSDKLib.NET_EVENT_FILE_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.DH_MSG_OBJECT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.DH_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_EVENT_FILE_INFO; /** * 事件类型EVENT_IVS_DENSITYDETECTION(人员密集度检测)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java index f2479df..3b84eca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_DISTANCE_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @description: (倒地报警事件)对应数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FIRE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FIRE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java index 426b4f8..07f3ab9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FIRE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FIRE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.NET_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java index 08cb960..08e2e8d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_FOLLOW_CAR_ALARM_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java index ad39b50..0c4a0e1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_HUDDLE_MATERIAL_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.NetSDKLib.NET_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java index 88aa53e..1ca5fbe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_NONMOTOR_ENTRYING_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：DEV_EVENT_NONMOTOR_ENTRYING_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java index 46087d8..c4f5079 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_OUTDOOR_ADVERTISEMENT_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.NetSDKLib.NET_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java index b647e44..e23ec04 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKINGSPACE_MANUALSNAP_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 事件 路侧停车位手动抓图 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java index 5382a40..b1a84dc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_PARKING_LOT_STATUS_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 事件类型 EVENT_IVS_PARKING_LOT_STATUS_DETECTION(室外停车位状态检测)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java index 38d3c7e..4d4e1b4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO.java @@ -1,15 +1,15 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.DH_MAX_DETECT_REGION_NUM; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.HDBJ_MAX_OBJECTS_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.DH_MAX_DETECT_REGION_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.HDBJ_MAX_OBJECTS_NUM; /** * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息 + * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_SIGN_ABNORMAL}(店招异常事件)对应的数据块描述信息 * @date 2020/11/17 */ public class DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO extends NetSDKLib.SdkStructure { @@ -43,7 +43,7 @@ public class DEV_EVENT_SHOP_SIGN_ABNORMAL_INFO extends NetSDKLib.SdkStructure { public short nRuleID; /** * 智能事件所属大类,对应枚举 - * {@link com.zhehekeji.web.lib.NetSDKLib.EM_CLASS_TYPE} + * {@link NetSDKLib.EM_CLASS_TYPE} */ public int emClassType; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java index ca1c673..8aae9bc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SHOP_WINDOW_POST_INFO.java @@ -1,15 +1,15 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.HDBJ_MAX_OBJECTS_NUM; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.SDK_MAX_DETECT_REGION_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.HDBJ_MAX_OBJECTS_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.SDK_MAX_DETECT_REGION_NUM; /** * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_WINDOW_POST}(橱窗张贴事件)对应的数据块描述信息 + * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_SHOP_WINDOW_POST}(橱窗张贴事件)对应的数据块描述信息 * @date 2020/11/16 */ public class DEV_EVENT_SHOP_WINDOW_POST_INFO extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SMOKE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SMOKE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java index 8e01291..aa2bbf2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_SMOKE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_SMOKE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_STREET_SUNCURE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_STREET_SUNCURE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java index 437750c..928568a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_STREET_SUNCURE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_STREET_SUNCURE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.EVENT_INTELLI_COMM_INFO; -import com.zhehekeji.web.lib.NetSDKLib.NET_MSG_OBJECT; -import com.zhehekeji.web.lib.NetSDKLib.NET_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.EVENT_INTELLI_COMM_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MSG_OBJECT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java index add7ccd..fc0b4b1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_CARDISTANCESHORT_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_EVENT_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_EVENT_NAME_LEN; /** * 事件类型 (车间距过小报警事件）对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java index b9731f4..82f8eee 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_PEDESTRAINRUNREDLIGHT_INFO.java @@ -1,15 +1,14 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.text.NumberFormat; -import java.util.Arrays; /** * @author 47081 * @version 1.0 * @description 事件类型 - * {@link com.zhehekeji.web.lib.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT} + * {@link com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE#EVENT_IVS_TRAFFIC_PEDESTRAINRUNREDLIGHT} * (交通-行人闯红灯事件)对应的数据块描述信息 * @date 2020/10/14 */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java index 7d761c3..23b72a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TRAFFIC_ROAD_ALERT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 事件类型(道路安全预警)对应的数据块描述信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java index 0634ac1..4445477 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_EVENT_TUMBLE_DETECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Arrays; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_RADAR_CONFIG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DEV_RADAR_CONFIG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java index 1cb775e..9f599a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DEV_RADAR_CONFIG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DEV_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：DEV_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DHDEVTIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DHDEVTIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java index 949e9f0..33fe316 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DHDEVTIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DHDEVTIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息里的时间定义 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java index f9ee3cb..3d89856 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryDeviceLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java index 684176b..3aed7b8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_DEVICE_LOG_ITEM_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_DEVICE_LOG_ITEM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.nio.charset.Charset; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_LOG_ITEM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DH_LOG_ITEM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java index e6e7db8..f69b2a3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DH_LOG_ITEM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DH_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/DISKCTRL_PARAM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/DISKCTRL_PARAM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java index 777a4fc..42649ce 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/DISKCTRL_PARAM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/DISKCTRL_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_CITIZENIDCARD_SEX_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/EM_CITIZENIDCARD_SEX_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java index 18ba4b1..25234b3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_CITIZENIDCARD_SEX_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_CITIZENIDCARD_SEX_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; public enum EM_CITIZENIDCARD_SEX_TYPE { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_HEALTH_CODE_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/EM_HEALTH_CODE_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java index 62a5170..493eb1a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_HEALTH_CODE_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_HEALTH_CODE_STATUS.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; /** * 健康码状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_IDCARD_MSG_TYPE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/EM_IDCARD_MSG_TYPE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java index 3ab5b77..dd2bac6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/EM_IDCARD_MSG_TYPE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EM_IDCARD_MSG_TYPE.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; /** * 身份证消息类型 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/EmptyStructure.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/EmptyStructure.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java index e7aabc5..8786cbf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/EmptyStructure.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/EmptyStructure.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_ANALYSE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_ANALYSE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java index 45a556c..cb2e32a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_ANALYSE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_ANALYSE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_DETECT_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_DETECT_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java index e55d995..aa06fd7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/FACEBODY_DETECT_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACEBODY_DETECT_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/FACERECOGNITION_PERSON_INFOEX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/FACERECOGNITION_PERSON_INFOEX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java index 0ae7eaa..535ffec 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/FACERECOGNITION_PERSON_INFOEX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/FACERECOGNITION_PERSON_INFOEX.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.*; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; /** * className：FACERECOGNITION_PERSON_INFOEX diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MANUAL_SNAP_PARAMETER.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MANUAL_SNAP_PARAMETER.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java index 141d4d4..2784212 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MANUAL_SNAP_PARAMETER.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MANUAL_SNAP_PARAMETER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 手动抓拍参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java index 589406a..426f3fb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_CANDIDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 测温查询候选人信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java index 171dd46..1130c0a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACEDETECT_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java index 48d266f..caefb6d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_FACERECOGNITION_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java index 76311fe..b55862f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java index 7eb9004..7d0fc5b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MEDIAFILE_ANATOMY_TEMP_DETECT_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MONITORWALL_COLLECTION_SCHEDULE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MONITORWALL_COLLECTION_SCHEDULE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java index f8b435d..03c90b0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MONITORWALL_COLLECTION_SCHEDULE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MONITORWALL_COLLECTION_SCHEDULE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_DEVICE_NAME_LEN; -import static com.zhehekeji.web.lib.NetSDKLib.NET_TSCHE_DAY_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_TSCHE_DAY_NUM; /** * 电视墙预案时间表 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MaxNameByteArrInfo.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MaxNameByteArrInfo.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java index 36c8fce..bdaa459 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MaxNameByteArrInfo.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxNameByteArrInfo.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/MaxSceneSupTypeByteArrInfo.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/MaxSceneSupTypeByteArrInfo.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java index 344b37c..31bca40 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/MaxSceneSupTypeByteArrInfo.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/MaxSceneSupTypeByteArrInfo.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 场景子类型字符串字节数组对象 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java index 8eaa0fe..1aae93d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NETDEV_VIRTUALCAMERA_STATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java index 074c87a..a679bb8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ACCESSCTL_SPECIALDAY_INFO.java @@ -1,8 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; - -import java.util.Arrays; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_BUILD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_BUILD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java index 7163621..664fed5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_BUILD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_BUILD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java index 182af69..ced0b3a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_DEV_STORAGE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_ALGORITHM_PARTITION_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_STORAGE_PACKET_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_ALGORITHM_PARTITION_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_STORAGE_PACKET_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SDK_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SDK_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java index 06c9006..02fb162 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SDK_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SDK_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SVN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SVN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java index cc66d45..0752214 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_SVN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_SVN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java index 567a153..2c65ee3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ALGORITHM_UPGRADE_AI_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java index e21b4f5..ec9d6ea 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_ANATOMYTEMPDETECT_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java index c1c2874..e8fc3d7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ANATOMY_TEMP_DETECT_FILTER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_AUDIO_DECODE_FORMAT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_AUDIO_DECODE_FORMAT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java index 3a5e5e7..d64e509 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_AUDIO_DECODE_FORMAT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_AUDIO_DECODE_FORMAT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_BATTERY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_BATTERY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java index b838f10..36970b7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_BATTERY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BATTERY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_BATTERY_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_BURN_PARAM_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_BURN_PARAM_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java index 32a5ace..b9ae2dc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_BURN_PARAM_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_BURN_PARAM_INFO.java @@ -1,12 +1,12 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 * @version 1.0 * @description 刻录参数配置 - * 对应枚举{@link com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_BURN_PARAM} + * 对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_BURN_PARAM} * @date 2020/11/10 */ public class NET_BURN_PARAM_INFO extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CAMERA_CFG_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CAMERA_CFG_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java index 5cd0387..56aa163 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CAMERA_CFG_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CAMERA_CFG_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CARDNOARRAY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CARDNOARRAY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java index b55a56f..25f032a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CARDNOARRAY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CARDNOARRAY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_CAMERASTATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_CAMERASTATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java index 60ea616..33c7172 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_CAMERASTATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设备状态回调结果 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java index 263a197..8b5bf85 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CB_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CB_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -11,7 +11,7 @@ import com.zhehekeji.web.lib.NetSDKLib; public class NET_CB_VIDEOSTAT_HEATMAP extends NetSDKLib.SdkStructure { public int nToken; /** - * 热度图类型,对应枚举类型{@link com.zhehekeji.web.lib.enumeration.EM_HEATMAP_TYPE} + * 热度图类型,对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.EM_HEATMAP_TYPE} */ public int emHeatMapType; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java index fc9a9e2..512b472 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Arrays; @@ -8,7 +8,7 @@ import java.util.Arrays; * @author 47081 * @version 1.0 * @description 门禁假日计划配置 - * 对应枚举类型{@link com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE} + * 对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE} * @date 2020/10/19 */ public class NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO extends NetSDKLib.SdkStructure { @@ -22,7 +22,7 @@ public class NET_CFG_ACCESSCTL_SPECIALDAYS_SCHEDULE_INFO extends NetSDKLib.SdkSt */ public boolean bSchdule; /** - * {@link com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标 + * {@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} 配置的下标 */ public int nGroupNo; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java index f0e4e7b..2f7c102 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Arrays; @@ -8,7 +8,7 @@ import java.util.Arrays; * @author 47081 * @version 1.0 * @description 门禁假日组配置,对应枚举 - * {@link com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} + * {@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_ACCESSCTL_SPECIALDAY_GROUP} * @date 2020/10/19 */ public class NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PLAY_PATH.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PLAY_PATH.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java index 773df95..57ad013 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PLAY_PATH.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PLAY_PATH.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PROPERTY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PROPERTY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java index e6a65d8..712e19f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_AUDIO_PROPERTY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_AUDIO_PROPERTY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 音频属性 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_BGY_CUSTOMERCFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_BGY_CUSTOMERCFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java index dadc6d3..952ba4f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_BGY_CUSTOMERCFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_BGY_CUSTOMERCFG.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.enumeration.EM_PLAY_WITH_MODE; -import com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_PLAY_WITH_MODE; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CALIBRATEBOX_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java similarity index 68% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CALIBRATEBOX_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java index 9a86344..181d178 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CALIBRATEBOX_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CALIBRATEBOX_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 校准框信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_ACCESSCONTROL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_ACCESSCONTROL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java index a6678d6..b29e39e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_ACCESSCONTROL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_ACCESSCONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 门禁能力集的结构体 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_AUDIO_FORMAT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_AUDIO_FORMAT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java index 865a6a4..11d8108 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_AUDIO_FORMAT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_AUDIO_FORMAT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 支持的音频格式 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_SPEAK.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_SPEAK.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java index f5c5e96..06163fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_CAP_SPEAK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_CAP_SPEAK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java index c89b186..c7affcb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_COURSE_RECORD_DEFAULT_CONFIG.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_CAN_START_STREAM; -import com.zhehekeji.web.lib.enumeration.EM_COMPOSIT_CHANNEL_BIND_MODE; -import com.zhehekeji.web.lib.enumeration.EM_IS_RECORD; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_CAN_START_STREAM; +import com.zhehekeji.web.lib.joyware.enumeration.EM_COMPOSIT_CHANNEL_BIND_MODE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_IS_RECORD; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java index 48b0ed7..b4d42f5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FILE_HOLD_DAYS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 录像保存天数配置 (对应枚举 {@link NET_EM_CFG_FILE_HOLD_DAYS} ) diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java index 1f62c64..2dca097 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java index 8542d52..3485ae6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_FORBIDDEN_ADVERT_PLAY_INFO.java @@ -1,8 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; - -import java.util.Arrays; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_HEALTH_CODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_HEALTH_CODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java index 1e30701..12a2d49 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_HEALTH_CODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_HEALTH_CODE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_QR_CODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java similarity index 65% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_QR_CODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java index fdb274f..671793e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_QR_CODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_QR_CODE_INFO.java @@ -1,12 +1,12 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 119178 * @version 1.0 * @description 配置二维码有效时间 - * 对应枚举{@link com.zhehekeji.web.lib.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_QR_CODE} + * 对应枚举{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_CFG_OPERATE_TYPE#NET_EM_CFG_QR_CODE} * @date 2020/12/11 */ public class NET_CFG_QR_CODE_INFO extends NetSDKLib.SdkStructure{ diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java index b2046e7..f61272f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 物体尺寸 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZEFILTER_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZEFILTER_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java index 96bfa04..40b2b39 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZEFILTER_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZEFILTER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** 尺寸过滤器 */ public class NET_CFG_SIZEFILTER_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE_WIDE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE_WIDE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java index ab98b64..7ee7e5b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_SIZE_WIDE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_SIZE_WIDE.java @@ -1,6 +1,5 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; import com.sun.jna.Union; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java index 1540892..7fef231 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_CFG_TIME_RECORDBACKUP_RESTORE_INFO extends NetSDKLib.SdkStructure{ public int dwSize; // 结构体大小 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java index 74f33ad..694a08e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CFG_VIDEOTALK_SIGNLIGHT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CHANNEL_CFG_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CHANNEL_CFG_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java index 610fc5f..309bff9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CHANNEL_CFG_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CHANNEL_CFG_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_ENTRY_DIRECTION; -import com.zhehekeji.web.lib.enumeration.EM_ENTRY_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_ENTRY_DIRECTION; +import com.zhehekeji.web.lib.joyware.enumeration.EM_ENTRY_TYPE; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMM_PROP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMM_PROP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java index 98ccead..59e653d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMM_PROP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMM_PROP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_COMM_PROP diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_CHANNEL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_CHANNEL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java index 35e6cc7..2762d94 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_CHANNEL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_CHANNEL_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.constant.SDKStructureFieldLenth; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java index b0fd622..442b917 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_DETAIL_INFO.java @@ -1,7 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.NET_SPLIT_MODE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java index e74bc75..f5130c6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSE_PLAN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSE_PLAN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * * @author 119178 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java index 0465c63..654fb0c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_WINDOWS_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_WINDOWS_NUMBER; /** * 录播主机模式信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java index 0782605..6d78529 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNELMODE_WINDOWS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 录播主机窗口信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNEL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNEL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java index 0534b03..7dfbb36 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COMPOSITECHANNEL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COMPOSITECHANNEL_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.*; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.*; /** * 组合通道信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java index 0399f3b..486735e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE.java @@ -1,12 +1,12 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_CAN_START_STREAM; -import com.zhehekeji.web.lib.enumeration.EM_COURSE_STATE; -import com.zhehekeji.web.lib.enumeration.EM_IS_RECORD; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_CAN_START_STREAM; +import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_STATE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_IS_RECORD; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_64; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; /** * 课程信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java index d359854..846cb35 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSECOMPOSITE_CHANNEL_MODE_ADD_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 录播主机添加模式返回信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSEMEDIA_FILE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSEMEDIA_FILE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java index d9697e6..4d49d68 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSEMEDIA_FILE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSEMEDIA_FILE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java similarity index 68% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java index 7e685c1..e7ca957 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_INFO.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_64; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_64; /** * 课程信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_RESULT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_RESULT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java index 3d7c64a..0a262aa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_COURSE_RESULT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_COURSE_RESULT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 课程信息和ID diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java index 3878028..68c4e66 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_CPU_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java index 620a5b8..f1aa0ed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CPU_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CPU_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_CPU_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_CPU_NUM; /** * className：NET_CPU_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java index d8027a3..faa34fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_DEV_VIDEO_INPUTS.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_VIDEOINPUTS_SERVICE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_VIDEOINPUTS_SERVICE_TYPE; /** * 视频输入信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_MEASURE_TEMPER.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_MEASURE_TEMPER.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java index 8353cc4..6c3be0f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_MEASURE_TEMPER.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_MEASURE_TEMPER.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_PROJECTS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_PROJECTS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java index 67c4faa..4634929 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_CUSTOM_PROJECTS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_CUSTOM_PROJECTS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DEVICE_STORAGE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_DEVICE_STORAGE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java index 6639f45..cc23b64 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DEVICE_STORAGE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DEVICE_STORAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java index d6c01c4..ec1114a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PATH; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; /** * CLIENT_DownLoadMultiFile 接口参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java index b178c2e..399bb3a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOADFILE_OPTIONS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 文件方式下载选项 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOAD_CONDITION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOAD_CONDITION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java index 3c6b0ef..bffa63e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_DOWNLOAD_CONDITION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_DOWNLOAD_CONDITION_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PATH; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java index e995319..cd21ebc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_EPIDEMIC_AREA_EXPERIENCE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 疫区经历信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACECOMPARISON_PTZ_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACECOMPARISON_PTZ_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java index bcc55a1..f07c992 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACECOMPARISON_PTZ_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACECOMPARISON_PTZ_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACEDETECT_IMAGE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACEDETECT_IMAGE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java index 064425d..d571a80 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACEDETECT_IMAGE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACEDETECT_IMAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACE_PIC_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACE_PIC_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java index 0a414bd..41d788c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FACE_PIC_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FACE_PIC_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java index f8a702f..7135e54 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * className：NET_FAN_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java index a5ce48b..8b8bf57 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FAN_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FAN_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_FAN_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_FAN_NUM; /** * className：NET_FAN_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FFCPERIOD_RANGE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FFCPERIOD_RANGE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java index a054acd..ad0b8ed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FFCPERIOD_RANGE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FFCPERIOD_RANGE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FINGERPRINT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FINGERPRINT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java index 3c68bdc..b7a6e32 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FINGERPRINT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FINGERPRINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FIRING_GPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FIRING_GPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java index 47642a6..334d8e2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FIRING_GPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FIRING_GPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java similarity index 67% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java index e14fb08..26c1f2f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java index fc8b0c3..98bd28b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FLOORS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FLOORS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java index b94bad6..a3a268e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_CUSTOM_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 跟随车辆报警自定义信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java index 2bb52d0..57a6b53 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_FOLLOW_CAR_ALARM_IMAGE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_HEALTH_CODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_HEALTH_CODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java index 8d60d4d..2053bde 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_HEALTH_CODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_HEALTH_CODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_HEALTH_CODE_INFO extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IDCARD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IDCARD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java index 7279222..862dcd6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IDCARD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IDCARD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_IDCARD_INFO extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IMAGE_COMPARE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IMAGE_COMPARE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java index 5d543ab..1e19c36 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IMAGE_COMPARE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IMAGE_COMPARE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ADD_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ADD_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java index 809998e..1bb54c2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ADD_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ADD_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 添加新的课程记录 入参指针 {@link NetSDKLib#CLIENT_AddCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java index d1856ea..cd72ce5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ASYNC_ADD_CUSTOM_DEVICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; -import com.zhehekeji.web.lib.enumeration.EM_CUSTOM_DEV_PROTOCOL_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.enumeration.EM_CUSTOM_DEV_PROTOCOL_TYPE; /** * CLIENT_AsyncAddCustomDevice 接口输入参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java index 1ca95ed..c52aae7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_IN_ATTACH_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java index 2b43dd0..00ab41a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_ATTACH_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_AUDIO_DECODE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_AUDIO_DECODE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java index 5eafd21..3423823 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_AUDIO_DECODE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_AUDIO_DECODE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_CAMERASTATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_CAMERASTATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java index a30a2de..dfb8122 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_CAMERASTATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java index 628899b..877ec94 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_ADD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机添加模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java index 58f1e0e..87d594c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机删除模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java index c5fcc70..92be5f9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_GET.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 录播主机获取模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java index dc73a7e..5736620 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机修改模式入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java index e17a077..263ec54 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取组合通道信息入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java index f3093fe..9dc2a59 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_GET_LOCKINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取锁定状态入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java index 5c5be88..d78320b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_LOCK_CONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 锁定和解锁组合通道和逻辑通道入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java index 110d91a..594b3d4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_SET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置组合通道信息入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java index 4a05095..10b9b85 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSECOMPOSITE_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 组合通道信息更新到time入参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GETINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GETINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java index 8b4c078..c9b6bfd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GETINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GETINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取指定教室的录像信息入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GET_TIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GET_TIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java index 3f62a73..cff82e8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_GET_TIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_GET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取当前课程已录制时间入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_SETINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_SETINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java index 2525fde..a568798 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_SETINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_SETINFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; /** * 设置指定教室的录像信息入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_UPDATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_UPDATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java index 1be00ee..d8795ad 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_COURSERECORD_UPDATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_COURSERECORD_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 录像信息更新到time入参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELETE_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELETE_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java index 63d5dd7..64fa3a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELETE_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELETE_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 删除课程记录 入参指针 {@link NetSDKLib#CLIENT_DeleteCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELIVER_USER_PICTURE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELIVER_USER_PICTURE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java index d8c67e8..64cddbe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DELIVER_USER_PICTURE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DELIVER_USER_PICTURE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_IN_DELIVER_USER_PICTURE diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DOWNLOAD_MULTI_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DOWNLOAD_MULTI_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java index f4457f2..1105266 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_DOWNLOAD_MULTI_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_DOWNLOAD_MULTI_FILE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_DOWNLOAD_FILE_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_SUBCLASSID_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_DOWNLOAD_FILE_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_SUBCLASSID_TYPE; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GETFACEEIGEN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GETFACEEIGEN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java index 6d7c556..a896cc6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GETFACEEIGEN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GETFACEEIGEN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java index bb5441b..994b90a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java index 135041c..7fabb85 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CAMERA_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CAMERA_INFO.java @@ -1,7 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CHANNEL_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CHANNEL_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java index d99c444..5973669 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_CHANNEL_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java index 81cf459..348c08d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_LOGIC_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机逻辑通道号入参，对应接口 {@link NetSDKLib#CLIENT_GetLogicChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_RECORD_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java index 08d3d4e..af44fe4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_COURSE_RECORD_MODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取录像模式入参，对应接口{@link NetSDKLib#CLIENT_GetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java index 9911c71..39d4540 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEFAULT_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取默认真实通道号入参，对应接口 {@link NetSDKLib#CLIENT_GetDefaultRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEVICE_AII_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEVICE_AII_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java index 10f8cee..bf79740 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_DEVICE_AII_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_DEVICE_AII_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_HEATMAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_HEATMAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java index 697d32c..9137a75 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_HEATMAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_HEATMAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java index 74ef8ed..cc543cf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_INPUT_CHANNEL_MEDIA.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机通道输入媒体介质入参 ，对应接口{@link NetSDKLib#CLIENT_GetInputChannelMedia} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java index 488fbe4..9966c6f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_REAL_PREVIEW_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取真实预览通道号 入参 {@link NetSDKLib#CLIENT_GetRealPreviewChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_RECORD_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_RECORD_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java index 3ad4d59..7701845 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_RECORD_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取录像状态 入参 {@link NetSDKLib#CLIENT_GetRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java index be1107d..d813936 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_GET_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -26,7 +26,7 @@ public class NET_IN_GET_VIDEOSTAT_HEATMAP extends NetSDKLib.SdkStructure { */ public NET_TIME stuEndTime; /** - * Ai热度图类型,枚举值类型{@link com.zhehekeji.web.lib.enumeration.EM_HEATMAP_TYPE} + * Ai热度图类型,枚举值类型{@link com.zhehekeji.web.lib.joyware.enumeration.EM_HEATMAP_TYPE} */ public int emHeatMapType; public NET_IN_GET_VIDEOSTAT_HEATMAP(){ diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java index 8813755..0a22f22 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 修改课程记录 入参指针 {@link NetSDKLib#CLIENT_ModifyCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java index ab13a2f..ef8b2c3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MODIFY_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 修改停车记录信息 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java index e69ceb3..daee9b8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 获取预案时间表 入参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_ENABLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_ENABLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java index 961fbe8..f58e2ba 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_GET_ENABLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_GET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙获取使能 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java index b27270f..1c9d209 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 设置预案时间表 入参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_ENABLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_ENABLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java index b6ea752..4a56367 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_MONITORWALL_SET_ENABLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_MONITORWALL_SET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙设置使能 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java index 494bba2..18bffc1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PRE_UPLOAD_REMOTE_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java index 75c5d52..37e87e5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZBASE_MOVEABSOLUTELY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @description: diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZ_STATUS_PROC.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZ_STATUS_PROC.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java index c330535..d331f47 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_PTZ_STATUS_PROC.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.fPTZStatusProcCallBack; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.fPTZStatusProcCallBack; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java index d3773d2..5a09c07 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java index 95d88a9..c495c42 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 查询课程视频信息入参 {@link NetSDKLib#CLIENT_DoQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java index a204bb5..c8c0960 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILECLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 关闭课程视频查询入参 {@link NetSDKLib#CLIENT_CloseQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java index e95c28b..d9b2cbf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSEMEDIA_FILEOPEN.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_COURSE_LOCK_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_COURSE_RECORD_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_LOCK_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_RECORD_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 开始查询课程视频信息入参 {@link NetSDKLib#CLIENT_OpenQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_CLOSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_CLOSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java index 00424e5..672dd31 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_CLOSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_CLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 结束查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourseClose} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_OPEN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_OPEN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java index 2e3d5e8..6f4c39d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_QUERY_COURSE_OPEN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_QUERY_COURSE_OPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 开始查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourseOpen} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_RADAR_ALARMPOINTINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_RADAR_ALARMPOINTINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java index 224cb35..2dad68f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_RADAR_ALARMPOINTINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_RADAR_ALARMPOINTINFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.fRadarAlarmPointInfoCallBack; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.fRadarAlarmPointInfoCallBack; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java index dc2cd6b..a6d0dfb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETCAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取景物点支持的能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java index e731cec..0fbddf4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_GETPOINTINFOS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 分页获取 信息标注信息列表 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java index 11b11ac..c1355d6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_SETPOINTINFO_INFO.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_SHAPE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_COMMON_STRING_64; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_POLYGON_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; /** * 设置景物点，原编号的景物点将会被覆盖 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java index 50743f5..577fdc5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SCENICSPOT_TURNTOPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 以景物标注点为中心，进行三维定位的输 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_2DCODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_2DCODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java index c7f08a9..93da704 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_2DCODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_2DCODE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.constant.SDKStructureFieldLenth; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth; import com.sun.jna.Pointer; /** @@ -17,7 +17,7 @@ public class NET_IN_SET_2DCODE extends NetSDKLib.SdkStructure { public int dwSize; /** * 二维码类型, - * 对应枚举类型{@link com.zhehekeji.web.lib.enumeration.NET_EM_2DCODE_TYPE} + * 对应枚举类型{@link com.zhehekeji.web.lib.joyware.enumeration.NET_EM_2DCODE_TYPE} */ public int em2DCodeType; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java index 3718edd..decbda5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_BLIND_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 设置逻辑通道号和真实通道号的绑定关系入参 ，对应接口 {@link NetSDKLib#CLIENT_SetBlindRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CAMERA_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CAMERA_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java index 395c7de..5b5f76e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CAMERA_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CAMERA_CFG.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CHANNEL_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CHANNEL_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java index 31f771a..69da076 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_CHANNEL_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java index 69eb167..57c4a81 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_MODE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_RECORD_MODE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; /** * 设置录像模式入参，对应接口{link NetSDKLib#CLIENT_SetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java index df27c8c..47cdccb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_COURSE_RECORD_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_COURSE_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 开启/关闭指定通道录像入参 {@link NetSDKLib#CLIENT_SetCourseRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java index aa79f98..cf253ab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SET_PARKINGSPACE_STATE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_PARKINGSPACE_STATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_PARKINGSPACE_STATE; /** * 设置停车车位状态 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SNAP_BY_EVENT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SNAP_BY_EVENT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java index 8665f90..162c64c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_SNAP_BY_EVENT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_SNAP_BY_EVENT.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_EVENT_IVS; -import com.zhehekeji.web.lib.enumeration.EM_EVENT_IVS_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS; +import com.zhehekeji.web.lib.joyware.enumeration.EM_EVENT_IVS_TYPE; /** * 按照事件类型抓图 入参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STARTSERACH_DEVICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STARTSERACH_DEVICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java index acf9eff..2019bb5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STARTSERACH_DEVICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STARTSERACH_DEVICE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.fSearchDevicesCBEx; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.fSearchDevicesCBEx; import com.sun.jna.Pointer; public class NET_IN_STARTSERACH_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STORAGE_DEV_INFOS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STORAGE_DEV_INFOS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java index 6b0ec0a..c420564 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_STORAGE_DEV_INFOS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_STORAGE_DEV_INFOS.java @@ -1,8 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_VOLUME_TYPE; -import com.sun.jna.Structure; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_VOLUME_TYPE; /** * NET_QUERY_DEV_STORAGE_NAMES 类型接口 输入参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java index aa43456..162802e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_RADAR_GET_OBJECT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java index 696eeea..f7a8be5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_RADAR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java index 6fe2ae5..896ce41 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_IN_TRAFFIC_SNAP_STROBE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ISCSI_TARGET.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_ISCSI_TARGET.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java index 047802d..ea60db4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_ISCSI_TARGET.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_ISCSI_TARGET.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_ISCSI_TARGET extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LEFTDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_LEFTDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java index 9e3f1b0..92d35f4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LEFTDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LEFTDETECTION_RULE_INFO.java @@ -1,8 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; -import com.zhehekeji.web.lib.structure.NET_CFG_SIZEFILTER_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** 事件类型 EVENT_IVS_LEFTDETECTION (物品遗留事件) 对应的规则配置 */ public class NET_LEFTDETECTION_RULE_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTINFO_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTINFO_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java index f12c94f..34bcee4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTINFO_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTINFO_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTPERIODS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTPERIODS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java index 3797943..ebc2ead 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LIGHTPERIODS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LIGHTPERIODS_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_TRFAFFIC_LIGHT_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_TRFAFFIC_LIGHT_TYPE; /** * 交通灯的持续时间，时间单位毫秒 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LOGIC_CHANNEL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_LOGIC_CHANNEL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java index 9163c93..4b20983 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_LOGIC_CHANNEL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_LOGIC_CHANNEL_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_LOGIC_CHANNEL; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_LOGIC_CHANNEL; /** * 通道信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java index 3dc1a0e..9e4566e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MANUALSNAP_PARKINGSPACE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 停车位的数据信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_IN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_IN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java index f4a7d8c..fb9dd11 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_IN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_IN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_OUT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_OUT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java index 465b45a..390bee7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MATCH_TWO_FACE_OUT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MATCH_TWO_FACE_OUT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIAFILE_GENERAL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIAFILE_GENERAL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java index 40882ef..96a2d2e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIAFILE_GENERAL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIAFILE_GENERAL_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PATH; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java index a1c3d46..6efd8db 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEDIA_QUERY_TRAFFICCAR_PARAM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java index ea1bdc4..9f56f20 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_MEMORY_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java index f585469..b36fdec 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MEMORY_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MEMORY_STATUS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_MEMORY_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_COLLECTION_NAME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_COLLECTION_NAME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java index 8f2902e..8d1a769 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_COLLECTION_NAME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_COLLECTION_NAME.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * 电视墙预案名称 拆分自{@link NET_IN_MONITORWALL_GET_COLL_SCHD} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_ENABLE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_ENABLE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java index e3aadd2..93628f0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_ENABLE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_ENABLE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 电视墙使能信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_NAME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java similarity index 64% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_NAME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java index 487c0f6..7bc08be 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITORWALL_NAME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITORWALL_NAME.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_COMMON_STRING_128; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_COMMON_STRING_128; /** * 电视墙名称 拆分自{@link NET_IN_MONITORWALL_GET_ENABLE} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java index de17b44..733a745 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_MONITOR_WALL_OUT_MODE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OBJECT_RADAR_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OBJECT_RADAR_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java index 5bc58ec..e56988c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OBJECT_RADAR_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OBJECT_RADAR_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ADD_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ADD_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java index bb21561..0b7ca24 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ADD_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ADD_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 添加新的课程记录 出参指针 {@link NetSDKLib#CLIENT_AddCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java index 6304e4b..b25325a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ASYNC_ADD_CUSTOM_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /*** * CLIENT_AsyncAddCustomDevice 接口输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java index 686d63a..1f3d5b5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_OUT_ATTACH_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java index ecc888e..045a13b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_ATTACH_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_AUDIO_DECODE_CAPS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_AUDIO_DECODE_CAPS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java index 4e9cde4..e882207 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_AUDIO_DECODE_CAPS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_AUDIO_DECODE_CAPS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_CAMERASTATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_CAMERASTATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java index d95b02a..ea8c469 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_CAMERASTATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_CAMERASTATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * {@link NetSDKLib#CLIENT_AttachCameraState} 输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java index fcaebc6..a4cb23e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_ADD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机添加模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java index 619ced8..d172303 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_DELETE.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机删除模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java index 6aec553..b138ca4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_GET.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机获取模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java index c74b49c..088e292 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_CHANNEL_MODE_MODIFY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MODE_NUMBER; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MODE_NUMBER; /** * 录播主机修改模式出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java index 87498c9..c8dd98f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取组合通道信息出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java index 4effaea..292bf64 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_GET_LOCKINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取锁定状态出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java index 1403507..7ec3efa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_LOCK_CONTROL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 锁定和解锁组合通道和逻辑通道出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java index 5c846a2..59a35a6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_SET_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置组合通道信息出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java index 0851fb8..51095cc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSECOMPOSITE_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 组合通道信息更新到time出参 {@link NetSDKLib#CLIENT_OperateCourseCompositeChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GETINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GETINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java index 8098578..7ab6075 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GETINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GETINFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COURSE_LOGIC_CHANNEL; /** * 获取指定教室的录像信息出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GET_TIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GET_TIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java index e0fd842..bf2de00 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_GET_TIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_GET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取当前课程已录制时间出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_SETINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_SETINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java index 87b0573..4824c23 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_SETINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_SETINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置指定教室的录像信息出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java index f68faca..21df743 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_COURSERECORD_UPDATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 录像信息更新到time出参 {@link NetSDKLib#CLIENT_OperateCourseRecordManager} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELETE_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELETE_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java index 3eebc33..fef6fd3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELETE_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELETE_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 删除课程记录 出参指针 {@link NetSDKLib#CLIENT_DeleteCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELIVER_USER_PICTURE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELIVER_USER_PICTURE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java index a97ef9b..5c7de40 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DELIVER_USER_PICTURE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DELIVER_USER_PICTURE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_OUT_DELIVER_USER_PICTURE diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java index d183d2a..9074ea8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_DOWNLOAD_MULTI_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 批量下载文件 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GETFACEEIGEN_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GETFACEEIGEN_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java index 0d9c757..5091d7e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GETFACEEIGEN_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GETFACEEIGEN_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java index 9bcacf6..d590900 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java index 595bfd3..be9022f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CAMERA_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CAMERA_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CHANNEL_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CHANNEL_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java index c74a386..b95651f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_CHANNEL_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java index 984c012..ea8e7de 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_LOGIC_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机默认真实通道号出参，对应接口 {@link NetSDKLib#CLIENT_GetLogicChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_RECORD_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java index acfd2c6..7ff88b5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_COURSE_RECORD_MODE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_RECORD_MODE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_RECORD_MODE; /** * 获取录像模式出参，对应接口{@link NetSDKLib#CLIENT_GetCourseRecordMode} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java index 11f3163..e44eac2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEFAULT_REAL_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取默认真实通道号出参，对应接口 {@link NetSDKLib#CLIENT_GetDefaultRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEVICE_AII_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEVICE_AII_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java index 1e9e229..e10f75b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_DEVICE_AII_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_DEVICE_AII_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_HEATMAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_HEATMAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java index 5ee1917..e140949 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_HEATMAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_HEATMAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java index c6e85f2..5a3ca9f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_INPUT_CHANNEL_MEDIA.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_ENUM_INPUT_CHANNEL_MEDIA; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_ENUM_INPUT_CHANNEL_MEDIA; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取录播主机通道输入媒体介质出参 ，对应接口{@link NetSDKLib#CLIENT_GetInputChannelMedia} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java index a51981a..b173428 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_REAL_PREVIEW_CHANNEL.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PREVIEW_CHANNEL_NUM; /** * 获取真实预览通道号 出参 {@link NetSDKLib#CLIENT_GetRealPreviewChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_RECORD_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_RECORD_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java index 35e6982..781bfa3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_RECORD_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取录像状态 出参 {@link NetSDKLib#CLIENT_GetRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java index 58d5118..7ddefce 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_GET_VIDEOSTAT_HEATMAP.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java index 2a33104..1a74ec0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 修改课程记录 出参指针 {@link NetSDKLib#CLIENT_ModifyCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java index 95fecd8..656ad36 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MODIFY_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 修改停车记录信息 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java index 9fda6d8..491f987 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_COLL_SCHD.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.NET_MAX_COLLECTION_NUM; /** * 获取预案时间表 出参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_ENABLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_ENABLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java index c947af3..8259bf6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_GET_ENABLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_GET_ENABLE.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_MONITORWALL_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_MONITORWALL_NUM; /** * 电视墙获取使能 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java index d9d0387..c730e2c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_COLL_SCHD.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置预案时间表 出参 {@link NetSDKLib#CLIENT_OperateMonitorWall} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_ENABLE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_ENABLE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java index 2dc496b..adb6de6 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_MONITORWALL_SET_ENABLE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_MONITORWALL_SET_ENABLE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_MONITORWALL_OPERATE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_MONITORWALL_OPERATE_TYPE; /** * 电视墙设置使能 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java index 6a9b954..20955bd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PRE_UPLOAD_REMOTE_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -18,7 +18,7 @@ public class NET_OUT_PRE_UPLOAD_REMOTE_FILE extends NetSDKLib.SdkStructure { */ public boolean bContinue2Upload; /** - * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.zhehekeji.web.lib.enumeration.EM_REASON_TYPE} + * 错误原因, 当bContinue2Upload为false时emType有效,错误原因请参考{@link com.zhehekeji.web.lib.joyware.enumeration.EM_REASON_TYPE} */ public int emType; public NET_OUT_PRE_UPLOAD_REMOTE_FILE(){ diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PTZ_STATUS_PROC.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PTZ_STATUS_PROC.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java index cf697e1..e10dd25 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_PTZ_STATUS_PROC.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_PTZ_STATUS_PROC.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 订阅云台元数据接口输输出参数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java index d1f5e39..6c19f36 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 查询课程 入参 {@link NetSDKLib#CLIENT_QueryCourse} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java index 394387b..085e4e5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 查询课程视频信息出参 {@link NetSDKLib#CLIENT_DoQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java index b59dccd..6d4835d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILECLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 关闭课程视频查询出参 {@link NetSDKLib#CLIENT_CloseQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java index ebe5d5c..ef9ddc3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSEMEDIA_FILEOPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 开始查询课程视频信息出参 {@link NetSDKLib#CLIENT_OpenQueryCourseMediaFile} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_CLOSE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_CLOSE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java index d5056f0..6503236 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_CLOSE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_CLOSE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 结束查询课程 出参 {@link NetSDKLib#CLIENT_QueryCourseClose} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_OPEN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_OPEN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java index 0531319..1b73d3c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_QUERY_COURSE_OPEN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_QUERY_COURSE_OPEN.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 开始查询课程 出参 {@link NetSDKLib#CLIENT_QueryCourseOpen} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_RADAR_ALARMPOINTINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_RADAR_ALARMPOINTINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java index fbf2323..7ee0a87 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_RADAR_ALARMPOINTINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_RADAR_ALARMPOINTINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 订阅雷达的报警点信息出参(对应接口 CLIENT_AttachRadarAlarmPointInfo) diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java index d00432a..b5eac5f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETCAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 获取景物点支持的能力 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java index 8671489..9b8f86d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_GETPOINTINFOS_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.constant.SDKStructureFieldLenth.MAX_SCENICSPOT_POINTS_NUM; +import static com.zhehekeji.web.lib.joyware.constant.SDKStructureFieldLenth.MAX_SCENICSPOT_POINTS_NUM; /** * 分页获取 信息标注信息列表 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java index 865044f..74a0ea8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_SETPOINTINFO_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置景物点，原编号的景物点将会被覆盖 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java index caf95ec..5864552 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SCENICSPOT_TURNTOPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 以景物标注点为中心，进行三维定位的 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_2DCODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_2DCODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java index 41a5d3f..37c9ff3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_2DCODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_2DCODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java index 29e2bad..7f9c040 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_BLIND_REAL_CHANNEL.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置逻辑通道号和真实通道号的绑定关系出参 ，对应接口{@link NetSDKLib#CLIENT_SetBlindRealChannel} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CAMERA_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CAMERA_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java index 744416d..178da22 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CAMERA_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CAMERA_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @version 1.0 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CHANNEL_CFG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CHANNEL_CFG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java index edad6cd..eed0953 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_CHANNEL_CFG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_CHANNEL_CFG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_MODE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_MODE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java index ddda56b..da154fc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_MODE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_MODE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置录像模式出参，对应接口{@link NetSDKLib#CLIENT_SetCourseRecordMode } diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java index 3a778a9..3c13b68 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_COURSE_RECORD_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_COURSE_RECORD_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 开启/关闭指定通道录像出参 {@link NetSDKLib#CLIENT_SetCourseRecordState} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java index 783d81e..1a393ec 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SET_PARKINGSPACE_STATE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 设置停车车位状态 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SNAP_BY_EVENT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SNAP_BY_EVENT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java index efd4708..16c2297 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_SNAP_BY_EVENT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_SNAP_BY_EVENT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 按照事件类型抓图 出参 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STARTSERACH_DEVICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STARTSERACH_DEVICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java index a226f00..7214596 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STARTSERACH_DEVICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STARTSERACH_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_OUT_STARTSERACH_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STORAGE_DEV_INFOS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STORAGE_DEV_INFOS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java index 81c2d10..fcb7a12 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_STORAGE_DEV_INFOS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_STORAGE_DEV_INFOS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_OUT_STORAGE_DEV_INFOS extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java index c79e8a0..fe6dac8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_RADAR_GET_OBJECT_INFO.java @@ -1,8 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; -import com.sun.jna.Structure; /** * @author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java index 0119266..c9d21ab 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_RADAR_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.NetSDKLib.NET_POINT; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_POINT; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java index 43eeb0c..c74acea 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_OUT_TRAFFIC_SNAP_STROBE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java index 07fb42b..9b940ff 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGDETECTION_RULE_INFO.java @@ -1,8 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; -import com.zhehekeji.web.lib.structure.NET_CFG_SIZEFILTER_INFO; +import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGRECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGRECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java index 60d3915..1e2f516 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PARKINGRECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PARKINGRECORD_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 停车位记录信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PASSERBY_DB_CONFIG_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_PASSERBY_DB_CONFIG_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java index 1f16e21..d10a27b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PASSERBY_DB_CONFIG_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PASSERBY_DB_CONFIG_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_PASSERBY_DB_OVERWRITE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_PASSERBY_DB_OVERWRITE_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PERSON_FEATURE_VALUE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_PERSON_FEATURE_VALUE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java index e22048b..cdea2cc 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_PERSON_FEATURE_VALUE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_PERSON_FEATURE_VALUE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_PERSON_FEATURE_VALUE_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java index ea5386c..7f2bd8b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_POWER_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java index 9cb9259..53feadf 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_POWER_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_POWER_STATUS.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_BATTERY_NUM; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_POWER_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_BATTERY_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POWER_NUM; /** * className：NET_POWER_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_ALARMPOINT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_ALARMPOINT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java index a43ccf5..70dd296 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_ALARMPOINT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_ALARMPOINT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 单个雷达报警点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_CARSPEED_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_CARSPEED_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java index 4876c84..5b4f00f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_CARSPEED_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_CARSPEED_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_RADAR_CARSPEED_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java index 13e179c..74e563d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RADAR_NOTIFY_ALARMPOINTINFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 上报的雷达报警点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_ERR_DETAIL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_ERR_DETAIL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java index 67927dc..7cf8bc1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_ERR_DETAIL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_ERR_DETAIL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_RAID_ERR_DETAIL_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_MEMBER_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_MEMBER_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java index f369828..428e05c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RAID_MEMBER_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RAID_MEMBER_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_RAID_MEMBER_INFO extends NetSDKLib.SdkStructure { public NET_RAID_MEMBER_INFO() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORDBACKUP_PROCESSTIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java similarity index 72% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORDBACKUP_PROCESSTIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java index cf1748f..0d0ab28 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORDBACKUP_PROCESSTIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORDBACKUP_PROCESSTIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; public class NET_RECORDBACKUP_PROCESSTIME extends SdkStructure{ public NET_TIME_EX1 stuStartTime; // 开始时间 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java index 32abdd4..de9e977 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_COURSE_RECORD_COMPRESSION_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_COURSE_RECORD_COMPRESSION_TYPE; /** * 录像文件信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO_ARRAY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO_ARRAY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java index 41a0548..f604b81 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RECORD_INFO_ARRAY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RECORD_INFO_ARRAY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java index 420b359..f3a634c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMAIN_ANALYSE_TOTAL_CAPACITY.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 @@ -9,7 +9,7 @@ import com.zhehekeji.web.lib.NetSDKLib; * @date 2021/2/8 */ public class NET_REMAIN_ANALYSE_TOTAL_CAPACITY extends NetSDKLib.SdkStructure { - /** 业务大类{@link com.zhehekeji.web.lib.NetSDKLib.EM_SCENE_CLASS_TYPE} */ + /** 业务大类{@link NetSDKLib.EM_SCENE_CLASS_TYPE} */ public int emClassType; /** 任务调度总共能分析的视频流数目 */ public int nNumber; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMOTE_FILE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMOTE_FILE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java index c316aa0..588c4d2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_REMOTE_FILE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_REMOTE_FILE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RIOTERDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java similarity index 90% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_RIOTERDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java index cdbd0c6..c6425a1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_RIOTERDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_RIOTERDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 事件类型 EVENT_IVS_RIOTERDETECTION (人群聚集) 对应的规则配置 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SCENICSPOT_CAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_SCENICSPOT_CAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java index b0cd49c..0e24950 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SCENICSPOT_CAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SCENICSPOT_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 景物信息记录能力集 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SPECIAL_DAYS_SCHEDULE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_SPECIAL_DAYS_SCHEDULE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java index c77961a..de1c7ee 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SPECIAL_DAYS_SCHEDULE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SPECIAL_DAYS_SCHEDULE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_SPECIAL_DAYS_SCHEDULE extends NetSDKLib.SdkStructure { /** diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STJ77D5_RADAR_CONFIG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STJ77D5_RADAR_CONFIG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java index b88555e..4b446c4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STJ77D5_RADAR_CONFIG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STJ77D5_RADAR_CONFIG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_STJ77D5_RADAR_CONFIG diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_DEVICE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_DEVICE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java index 38a449b..7908858 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_DEVICE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_DEVICE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_STORAGE_DEVICE extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java index a060d36..64e9ad9 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_STORAGE_PARTITION extends NetSDKLib.SdkStructure { public NET_STORAGE_PARTITION() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java index 65fec46..ea614fe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_PARTITION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_PARTITION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_RAID.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_RAID.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java index 84a846f..6aaffad 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_RAID.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_RAID.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_STORAGE_RAID extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_TANK.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_TANK.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java index 17d8ba8..8c8fdcb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STORAGE_TANK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STORAGE_TANK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; public class NET_STORAGE_TANK extends NetSDKLib.SdkStructure { public NET_STORAGE_TANK() { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_LOG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_LOG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java index df69d39..3c086a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_LOG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_LOG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志结构体 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_OLD_LOG.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_OLD_LOG.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java index f4ecec1..c90aa5a 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_STU_OLD_LOG.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_STU_OLD_LOG.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 旧的日志结构体,为了和新的对齐 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SYSTEM_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_SYSTEM_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java index 3f2cc8b..4e10a04 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_SYSTEM_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_SYSTEM_STATUS.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.sun.jna.Pointer; public class NET_SYSTEM_STATUS extends NetSDKLib.SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java similarity index 74% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java index b115f0a..312811b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_DEVICE_NAME_LEN; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_DEVICE_NAME_LEN; /** * className：NET_TEMPERATURE_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATISTICS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATISTICS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java index f6b5d40..d2ea8fa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATISTICS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATISTICS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATUS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATUS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java index 8c6c452..6aace5e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TEMPERATURE_STATUS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TEMPERATURE_STATUS.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_TEMPERATURE_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_TEMPERATURE_NUM; /** * className：NET_TEMPERATURE_STATUS diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java index 4c7990b..066039c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.util.Date; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java index 40c284e..362ed0d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX1.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX1.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java index 95608e3..dad8a8d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_EX1.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_EX1.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_RECORDBACKUP_TASK.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_RECORDBACKUP_TASK.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java index 84db16b..176b433 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TIME_RECORDBACKUP_TASK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TIME_RECORDBACKUP_TASK.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; public class NET_TIME_RECORDBACKUP_TASK extends SdkStructure{ public int nChannelCount; // 通道有效个数 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java index 61bdcba..dd290aa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_CHANNEL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_TRAFFICLIGHT_CHANNEL_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java index 8359cc5..480d7d3 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFICLIGHT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFICLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_TRAFFICLIGHT_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_FLOW_STAT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_FLOW_STAT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java index c3fd27c..0556353 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_FLOW_STAT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_FLOW_STAT.java @@ -1,9 +1,9 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_DETECT_SENSOR_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_TRAFFIC_FLOW_STATUS; -import com.zhehekeji.web.lib.enumeration.EM_VIRTUAL_COIL_OCCUPANCY_STATUS; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_TRAFFIC_FLOW_STATUS; +import com.zhehekeji.web.lib.joyware.enumeration.EM_VIRTUAL_COIL_OCCUPANCY_STATUS; /** * @author ： 47040 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_LIGHT_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_LIGHT_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java index 052bc2e..4b830bb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TRAFFIC_LIGHT_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TRAFFIC_LIGHT_STATE.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_TRAFFIC_LIGHT_STATUS; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_TRAFFIC_LIGHT_STATUS; /** * 信号灯指示灯状态 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TSECT_DAY.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java similarity index 73% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_TSECT_DAY.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java index 522646d..cfd98a8 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_TSECT_DAY.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_TSECT_DAY.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.NET_TSCHE_SEC_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_TSCHE_SEC_NUM; /** * 拆分自{@link MONITORWALL_COLLECTION_SCHEDULE} diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_UPLOAD_CLIENT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_UPLOAD_CLIENT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java index cdc4669..b5c3902 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_UPLOAD_CLIENT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_UPLOAD_CLIENT_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_UPLOAD_FLAG; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_UPLOAD_FLAG; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_USER_PICTURE_DATA.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_USER_PICTURE_DATA.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java index ee256fc..d001d7b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_USER_PICTURE_DATA.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_USER_PICTURE_DATA.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_USER_PICTURE_DATA diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VAOBJECT_NUMMAN.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VAOBJECT_NUMMAN.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java index e00829d..7c46a79 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VAOBJECT_NUMMAN.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VAOBJECT_NUMMAN.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.NET_RECT; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_RECT; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 检测到的人信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java index 5da23fb..535ff90 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_DRIVING_DIRECTION_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * NET_VEHICLE_OBJECT szDrivingDirection 的拆解字段 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_OBJECT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_OBJECT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java index 19838c9..9b8effb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VEHICLE_OBJECT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VEHICLE_OBJECT.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_DETECT_SENSOR_TYPE; -import com.zhehekeji.web.lib.enumeration.EM_VEHICLEINOUT_CAR_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_DETECT_SENSOR_TYPE; +import com.zhehekeji.web.lib.joyware.enumeration.EM_VEHICLEINOUT_CAR_TYPE; /** * 车辆信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java similarity index 91% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java index 3ea2daf..39f7ae4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOABNORMALDETECTION_RULE_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** * 事件类型EVENT_IVS_VIDEOABNORMALDETECTION(视频异常)对应的规则配置 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOIN_DEFOG_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java similarity index 88% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOIN_DEFOG_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java index c12c2d3..b6d57ca 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOIN_DEFOG_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOIN_DEFOG_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * className：NET_VIDEOIN_DEFOG_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java index 9dc5553..af20fed 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEOTALK_SIGNLIGHT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java similarity index 76% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java index b9f6721..093e111 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_VIDEO_DIAGNOSIS_RECORD_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_SOURCE_VIDEO_LOCATION; -import com.zhehekeji.web.lib.enumeration.EM_VIDEO_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_SOURCE_VIDEO_LOCATION; +import com.zhehekeji.web.lib.joyware.enumeration.EM_VIDEO_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_WANDERDETECTION_RULE_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/NET_WANDERDETECTION_RULE_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java index 1830de6..ec003a2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/NET_WANDERDETECTION_RULE_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/NET_WANDERDETECTION_RULE_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib.POINTCOORDINATE; -import com.zhehekeji.web.lib.NetSDKLib.SdkStructure; +import com.zhehekeji.web.lib.joyware.NetSDKLib.POINTCOORDINATE; +import com.zhehekeji.web.lib.joyware.NetSDKLib.SdkStructure; /** 事件类型 EVENT_IVS_WANDERDETECTION( 徘徊事件)对应的规则配置 */ public class NET_WANDERDETECTION_RULE_INFO extends SdkStructure { diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/Net_PIC_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java similarity index 71% rename from web/src/main/java/com/zhehekeji/web/lib/structure/Net_PIC_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java index ef83f5f..96960aa 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/Net_PIC_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/Net_PIC_INFO.java @@ -1,8 +1,8 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PATH; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; /** * className：Net_PIC_INFO diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ObjectPath.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java similarity index 70% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ObjectPath.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java index 1c41c34..878a740 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ObjectPath.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectPath.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 图路径对象 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/ObjectUrl.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java similarity index 53% rename from web/src/main/java/com/zhehekeji/web/lib/structure/ObjectUrl.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java index 1a60068..a0eb086 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/ObjectUrl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/ObjectUrl.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_PATH; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_PATH; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java similarity index 82% rename from web/src/main/java/com/zhehekeji/web/lib/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java index adef137..ced3630 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PASSERBY_DB_DUPLICATE_REMOVE_CONFIG_INFO.java @@ -1,7 +1,7 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.EM_PASSERBY_DB_DUPLICATE_REMOVE_TYPE; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/POINTCOORDINATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/POINTCOORDINATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java index 87481ea..051d200 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/POINTCOORDINATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTCOORDINATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * PTZ景物坐标 8191x8191 坐标系 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/POINTINFOS.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/POINTINFOS.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java index 634db19..897455b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/POINTINFOS.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POINTINFOS.java @@ -1,10 +1,10 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; -import com.zhehekeji.web.lib.enumeration.NET_EM_SHAPE_TYPE; +import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.joyware.enumeration.NET_EM_SHAPE_TYPE; -import static com.zhehekeji.web.lib.NetSDKLib.MAX_COMMON_STRING_64; -import static com.zhehekeji.web.lib.NetSDKLib.NET_MAX_POLYGON_NUM; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.MAX_COMMON_STRING_64; +import static com.zhehekeji.web.lib.joyware.NetSDKLib.NET_MAX_POLYGON_NUM; /** * PTZ景物点信息 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/POSTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java similarity index 78% rename from web/src/main/java/com/zhehekeji/web/lib/structure/POSTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java index 5bf2394..d50b1fd 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/POSTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/POSTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * PTZ 绝对坐标 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/PTZ_NORMALIZED_POSITION_UNIT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java similarity index 83% rename from web/src/main/java/com/zhehekeji/web/lib/structure/PTZ_NORMALIZED_POSITION_UNIT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java index 85bc287..bb610e5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/PTZ_NORMALIZED_POSITION_UNIT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PTZ_NORMALIZED_POSITION_UNIT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/PlateNumber.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java similarity index 66% rename from web/src/main/java/com/zhehekeji/web/lib/structure/PlateNumber.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java index 00d2663..117f2ec 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/PlateNumber.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/PlateNumber.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/QUERY_DEVICE_LOG_PARAM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/QUERY_DEVICE_LOG_PARAM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java index 460d6ec..9ceae48 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/QUERY_DEVICE_LOG_PARAM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/QUERY_DEVICE_LOG_PARAM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 查询条件 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SCENE_SUPPORT_RULE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java similarity index 97% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SCENE_SUPPORT_RULE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java index 8892ba2..dae985c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SCENE_SUPPORT_RULE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SCENE_SUPPORT_RULE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java similarity index 89% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java index 80a2d5d..c5120b2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryDeviceLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM_EX.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM_EX.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java index 3ddcb68..9b9ba21 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEVICE_LOG_ITEM_EX.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEVICE_LOG_ITEM_EX.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import java.nio.charset.Charset; diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEV_TIME.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEV_TIME.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java index 0e2712c..2317ab7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_DEV_TIME.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_DEV_TIME.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息里的时间定义 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_HARDDISK_STATE.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java similarity index 79% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_HARDDISK_STATE.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java index d3fcbeb..2e9b699 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_HARDDISK_STATE.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_HARDDISK_STATE.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_LOG_ITEM.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_LOG_ITEM.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java index 4b129f6..8d9ead5 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_LOG_ITEM.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_LOG_ITEM.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * 日志信息,对应接口CLIENT_QueryLog接口 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_TSECT.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java similarity index 92% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SDK_TSECT.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java index 1dbbc4c..306e64b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SDK_TSECT.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SDK_TSECT.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_BATTERY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java similarity index 87% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_BATTERY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java index 4e3f944..67e5f4b 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_BATTERY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_BATTERY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_PANEL_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java similarity index 84% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_PANEL_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java index 12b8059..5842eb4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_PANEL_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_PANEL_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java similarity index 86% rename from web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java index 73d5b3e..83051db 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/SOLARCELL_SYSTEM_HISTORY_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/START_LISTEN_FINISH_RESULT_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java similarity index 77% rename from web/src/main/java/com/zhehekeji/web/lib/structure/START_LISTEN_FINISH_RESULT_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java index 11be7b6..959bc27 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/START_LISTEN_FINISH_RESULT_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/START_LISTEN_FINISH_RESULT_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @Author 251589 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/StringByteArrSixteen.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java similarity index 75% rename from web/src/main/java/com/zhehekeji/web/lib/structure/StringByteArrSixteen.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java index 9cbf823..6bd46b4 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/StringByteArrSixteen.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/StringByteArrSixteen.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/USER_TIME_SECTION.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java similarity index 69% rename from web/src/main/java/com/zhehekeji/web/lib/structure/USER_TIME_SECTION.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java index 31c2c21..aad3028 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/USER_TIME_SECTION.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/USER_TIME_SECTION.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 47081 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/VA_CAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java similarity index 81% rename from web/src/main/java/com/zhehekeji/web/lib/structure/VA_CAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java index a0923ac..fa24625 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/VA_CAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 * @description 视频分析能力集 diff --git a/web/src/main/java/com/zhehekeji/web/lib/structure/VA_DYNAMIC_CAPS_INFO.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java similarity index 80% rename from web/src/main/java/com/zhehekeji/web/lib/structure/VA_DYNAMIC_CAPS_INFO.java rename to web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java index 7345b81..36b7be7 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/structure/VA_DYNAMIC_CAPS_INFO.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/structure/VA_DYNAMIC_CAPS_INFO.java @@ -1,6 +1,6 @@ -package com.zhehekeji.web.lib.structure; +package com.zhehekeji.web.lib.joyware.structure; -import com.zhehekeji.web.lib.NetSDKLib; +import com.zhehekeji.web.lib.joyware.NetSDKLib; /** * @author 251823 diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 1e3ad00..2488b03 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -4,10 +4,12 @@ import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.CameraIO; import com.zhehekeji.web.entity.CameraIOConfig; -import com.zhehekeji.web.lib.ZWPtzControlModule; +import com.zhehekeji.web.lib.HikPtzControlModule; +import com.zhehekeji.web.lib.JoywarePtzControlModule; import com.zhehekeji.web.mapper.CameraIOConfigMapper; import com.zhehekeji.web.mapper.CameraIOMapper; import com.zhehekeji.web.mapper.CameraMapper; @@ -39,18 +41,13 @@ public class CameraService { private CameraIOMapper ioMapper; @Resource private CameraIOConfigMapper configMapper; - - @Value("${cameraPassword}") - private String cameraPassword; - @Value("${cameraPort}") - private Integer cameraPort; - @Value("${cameraUser}") - private String cameraUser; + @Resource + private ConfigProperties configProperties; public Integer add(Camera camera) { - camera.setUser(cameraUser); - camera.setPassword(cameraPassword); - camera.setPort(cameraPort); + camera.setUser(configProperties.getCameraConfig().getCameraUser()); + camera.setPassword(configProperties.getCameraConfig().getCameraPassword()); + camera.setPort(configProperties.getCameraConfig().getCameraPort()); camera.setUpdateTime(LocalDateTime.now()); try { cameraMapper.insert(camera); @@ -179,7 +176,11 @@ public class CameraService { conver(cameraIO,type); ioMapper.updateById(cameraIO); } - ZWPtzControlModule.ptz(ptzId, cameraIO.getName(), cameraId); + if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA){ + HikPtzControlModule.ptz(ptzId,cameraIO.getName(),cameraId); + }else if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.JOYWARE_CAMERA){ + JoywarePtzControlModule.ptz(ptzId, cameraIO.getName(), cameraId); + } log.info("设置 预置点 球机ID:{},预置点ID:{}", cameraId, ptzId); return cameraIO.getId(); } diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java index 72884b2..fa74c4a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/InitService.java +++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java @@ -1,13 +1,16 @@ package com.zhehekeji.web.service; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.KsecUpPcInfo; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.lib.*; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.zhehekeji.web.mapper.CameraMapper; import com.zhehekeji.web.mapper.KsecUpPcMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.service.ksec.KsecNettyClient; +import com.zhehekeji.web.service.robotic.NettyClient; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -18,6 +21,10 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; +/** + * 服务初始化 + * 上位机、 plc、球机 连接 + */ @Component @Slf4j public class InitService implements ApplicationRunner { @@ -34,11 +41,9 @@ public class InitService implements ApplicationRunner { public static Integer cameraNum; - @Value("${cameraType}") - private Integer cameraType; + @Resource + private ConfigProperties configProperties; - @Value("${serverMode}") - private Integer serverMode; @Resource private KsecUpPcMapper upPcMapper; @@ -46,9 +51,9 @@ public class InitService implements ApplicationRunner { public void run(ApplicationArguments args) throws Exception { //球机登录 List cameras = cameraMapper.selectByMap(new HashMap<>(0)); - loginThread loginThread = new loginThread(cameras, cameraType); + loginThread loginThread = new loginThread(cameras, configProperties.getCameraConfig().getCameraType()); loginThread.start(); - if(serverMode == 0){ + if(configProperties.getServerMode() == 0){ log.info("PLC TCP MODE"); //plc 连接状态初始化 List streets = streetMapper.selectByMap(new HashMap<>(0)); @@ -66,7 +71,7 @@ public class InitService implements ApplicationRunner { } }); - }else if(serverMode == 1){ + }else if(configProperties.getServerMode() == 1){ log.info("KESC JSON MODE"); // 昆船协议 KsecUpPcInfo ksec = upPcMapper.selectById(1); @@ -99,11 +104,11 @@ public class InitService implements ApplicationRunner { public void run() { cameras.forEach(camera -> { if(cameraType == 0){ - NetSDKLib.LLong lLong = ZWLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),camera.getId()); + NetSDKLib.LLong lLong = JoywareLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword(),camera.getId()); if(lLong.longValue() <= 0){ log.error("初始相机 登录失败：cameraId{}",camera.getId()); }else { - CameraConnMap.conn(camera.getId(),lLong); + HikLoginModule.CameraConnMap.conn(camera.getId(),lLong); log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue()); } }else if(cameraType == 1){ @@ -112,7 +117,7 @@ public class InitService implements ApplicationRunner { log.error("初始相机 登录失败：cameraId{}",camera.getId()); }else { NetSDKLib.LLong lLong = new NetSDKLib.LLong(userId); - CameraConnMap.conn(camera.getId(),lLong); + HikLoginModule.CameraConnMap.conn(camera.getId(),lLong); log.info("初始相机登录成功 cameraId:{},loginId:{}",camera.getId(),lLong.longValue()); } } diff --git a/web/src/main/java/com/zhehekeji/web/service/OrderService.java b/web/src/main/java/com/zhehekeji/web/service/OrderService.java index 682d2b6..6c80573 100644 --- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java +++ b/web/src/main/java/com/zhehekeji/web/service/OrderService.java @@ -3,9 +3,10 @@ package com.zhehekeji.web.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.PathUtil; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Order; import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.lib.ZWPtzControlModule; +import com.zhehekeji.web.lib.JoywarePtzControlModule; import com.zhehekeji.web.mapper.OrderMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.OrderSaveReq; @@ -32,11 +33,8 @@ public class OrderService { @Resource private StreetMapper streetMapper; - @Value("${mp4Path}") - private String mp4Path; - - @Value("${cameraType}") - private Integer cameraType; + @Resource + private ConfigProperties configProperties; public PageInfo orders(OrderSearch orderSearch) { List streets = streetMapper.selectByMap(new HashMap<>(0)); @@ -64,10 +62,10 @@ public class OrderService { String[] pics = orderVO.getPicPaths().split(","); orderVO.setPics(pics); } - if(cameraType == 1 && !StringUtils.isEmpty(orderVO.getVideoPath1())){ + if(configProperties.getCameraConfig().getCameraType() == 1 && !StringUtils.isEmpty(orderVO.getVideoPath1())){ orderVO.setCmd1(" VSPlayer "+ orderVO.getVideoPath1()); } - if(cameraType == 1 && !StringUtils.isEmpty(orderVO.getVideoPath2())){ + if(configProperties.getCameraConfig().getCameraType() == 1 && !StringUtils.isEmpty(orderVO.getVideoPath2())){ orderVO.setCmd1(" VSPlayer "+ orderVO.getVideoPath2()); } orderVO.setGoodsLocation(location(orderVO,streetMap.get(orderVO.getStreetId()))); @@ -113,12 +111,12 @@ public class OrderService { if (street.getCamera1Id() != null) { String path = PathUtil.createFileName("mp4"); - ZWPtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime()); + JoywarePtzControlModule.downloadMp4(street.getCamera1Id(), configProperties.getSavePath().getMp4Path()+ path, orderNum, order.getStartTime(), update.getEndTime()); update.setVideoPath1(path); } if (street.getCamera2Id() != null) { String path = PathUtil.createFileName("mp4"); - ZWPtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime()); + JoywarePtzControlModule.downloadMp4(street.getCamera2Id(), configProperties.getSavePath().getMp4Path() + path, orderNum, order.getStartTime(), update.getEndTime()); update.setVideoPath2(path); } orderMapper.updateById(update); diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index fad00ce..75621b9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -2,11 +2,11 @@ package com.zhehekeji.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhehekeji.common.util.PathUtil; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.*; import com.zhehekeji.web.lib.*; import com.zhehekeji.web.mapper.*; import com.zhehekeji.web.pojo.OrderVO; -import com.zhehekeji.web.pojo.stock.CheckByMan; import com.zhehekeji.web.pojo.stock.StockStatus; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -41,11 +41,8 @@ public class PlcService { @Resource private OrderService orderService; - @Value("${mp4Path}") - private String mp4Path; - - @Value("${mediaPath}") - private String mediaPath; + @Resource + private ConfigProperties configProperties; @Resource private StreetService streetService; @@ -159,8 +156,8 @@ public class PlcService { stockMapper.updateById(stock); } if(!code.equals(originalPoint)){ - ZWPtzControlModule.pic(street.getCamera1Id(),0,orderInfo); - ZWPtzControlModule.pic(street.getCamera2Id(),0,orderInfo); + JoywarePtzControlModule.pic(street.getCamera1Id(),0,orderInfo); + JoywarePtzControlModule.pic(street.getCamera2Id(),0,orderInfo); } } @@ -185,7 +182,7 @@ public class PlcService { ioConfigs.forEach(ioConfig->{ if(ioConfig.getPtzId() != null && ioConfig.getPtzId() > 0){ log.info("tp ptz , code:{},cameraId:{}",code,cameraId1); - ZWPtzControlModule.toPtz(ioConfig.getPtzId(),ioConfig.getCameraId()); + JoywarePtzControlModule.toPtz(ioConfig.getPtzId(),ioConfig.getCameraId()); } }); } @@ -268,12 +265,12 @@ public class PlcService { warn.setEndTime(LocalDateTime.now()); if (street.getCamera1Id() != null) { String path = PathUtil.createFileName("mp4"); - ZWPtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime()); + JoywarePtzControlModule.downloadMp4(street.getCamera1Id(), configProperties.getSavePath().getMp4Path() + path, warnId.toString(), warn.getStartTime(), warn.getEndTime()); warn.setVideoPath1(path); } if (street.getCamera2Id() != null) { String path = PathUtil.createFileName("mp4"); - ZWPtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, warnId.toString(), warn.getStartTime(), warn.getEndTime()); + JoywarePtzControlModule.downloadMp4(street.getCamera2Id(), configProperties.getSavePath().getMp4Path() + path, warnId.toString(), warn.getStartTime(), warn.getEndTime()); warn.setVideoPath2(path); } warnMapper.updateById(warn); @@ -325,7 +322,7 @@ public class PlcService { if(ioConfigs.size() > 0){ ptzId = ioConfigs.get(0).getPtzId(); } - ZWPtzControlModule.turn360C8(street.getCamera1Id(),ptzId); + JoywarePtzControlModule.turn360C8(street.getCamera1Id(),ptzId); } if(street.getCamera2Id() != null) { List ioConfigs = ioMapper.selectList(new QueryWrapper().eq("code","C8").eq("camera_id",street.getCamera2Id())); @@ -333,7 +330,7 @@ public class PlcService { if(ioConfigs.size() > 0){ ptzId = ioConfigs.get(0).getPtzId(); } - ZWPtzControlModule.turn360C8(street.getCamera2Id(),ptzId); + JoywarePtzControlModule.turn360C8(street.getCamera2Id(),ptzId); } } @@ -363,8 +360,8 @@ public class PlcService { if(stock != null) { stock.setCategory(barCodeSys); stock.setCount(boxNumSys); - String prevFile = mediaPath+stock.getPreoperationPic(); - String overFile = mediaPath+stock.getOveroperationPic(); + String prevFile = configProperties.getSavePath().getMediaPath()+stock.getPreoperationPic(); + String overFile = configProperties.getSavePath().getMediaPath()+stock.getOveroperationPic(); String code = BarCodeScan.detectBestBarCode(overFile); if(boxNumSys == boxNumAlgo && code.equals(barCodeSys)) { stock.setStatus(StockStatus.SUCCESS.getStatus()); diff --git a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java b/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java index db89360..93f9385 100644 --- a/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java +++ b/web/src/main/java/com/zhehekeji/web/service/RealTimeService.java @@ -1,10 +1,12 @@ package com.zhehekeji.web.service; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.Camera; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.CameraMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.realTime.RealTime; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -15,6 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * 实时视频流 + */ @Service public class RealTimeService { @@ -23,14 +28,10 @@ public class RealTimeService { @Resource private CameraMapper cameraMapper; - @Value("${videoStyleRow}") - private Integer videoStyleRow; - - @Value("${videoStyleColumn}") - private Integer videoStyleColumn; - @Value("${mediaServer}") private String mediaServer; + @Autowired + private ConfigProperties configProperties; public List realTimes(){ List streets = streetMapper.selectByMap(new HashMap<>(0)); @@ -64,8 +65,8 @@ public class RealTimeService { all.setStreetId(0); all.setStreetName("全部"); all.setCameras(cameras); - all.setVideoStyleRow(videoStyleRow); - all.setVideoStyleColumn(videoStyleColumn); + all.setVideoStyleRow(configProperties.getVideoStyleConfig().getVideoStyleRow()); + all.setVideoStyleColumn(configProperties.getVideoStyleConfig().getVideoStyleColumn()); realTimes.add(all); return realTimes; diff --git a/web/src/main/java/com/zhehekeji/web/service/StreetService.java b/web/src/main/java/com/zhehekeji/web/service/StreetService.java index f23d4e9..5102e13 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StreetService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StreetService.java @@ -8,7 +8,10 @@ import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.pojo.street.StreetSearch; import com.zhehekeji.web.pojo.street.StreetType; import com.zhehekeji.web.pojo.street.StreetVO; +import com.zhehekeji.web.service.robotic.NettyClient; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +31,7 @@ public class StreetService { private NettyClient nettyClient; @Transactional(rollbackFor = Exception.class) + @Cacheable(value="street",key = "#street.id") public Integer add(Street street) { List shelves = check(street); street.setCreateTime(LocalDateTime.now()); @@ -98,6 +102,7 @@ public class StreetService { } @Transactional(rollbackFor = Exception.class) + @CacheEvict(value="street",key="#street.id") public void edit(Street street) { check(street); try { diff --git a/web/src/main/java/com/zhehekeji/web/service/WarnService.java b/web/src/main/java/com/zhehekeji/web/service/WarnService.java index 83afcb4..82d50b3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/WarnService.java +++ b/web/src/main/java/com/zhehekeji/web/service/WarnService.java @@ -2,6 +2,7 @@ package com.zhehekeji.web.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.mapper.WarnMapper; import com.zhehekeji.web.pojo.warn.WarnSearch; import com.zhehekeji.web.pojo.warn.WarnVO; @@ -19,8 +20,8 @@ public class WarnService { @Resource private WarnMapper warnMapper; - @Value("${cameraType}") - private Integer cameraType; + @Resource + private ConfigProperties configProperties; public PageInfo page(WarnSearch warnSearch){ PageHelper.startPage(warnSearch.getPageNum(),warnSearch.getPageSize()); @@ -34,10 +35,10 @@ public class WarnService { int remainingSeconds = seconds.intValue() % 60; String timeLength = String.format("%02d:%02d", minutes,remainingSeconds); warnVO.setTimeLength(timeLength); - if(cameraType == 1 && !StringUtils.isEmpty(warnVO.getVideoPath1())){ + if(configProperties.getCameraConfig().getCameraType() == 1 && !StringUtils.isEmpty(warnVO.getVideoPath1())){ warnVO.setCmd1(" VSPlayer "+ warnVO.getVideoPath1()); } - if(cameraType == 1 && !StringUtils.isEmpty(warnVO.getVideoPath2())){ + if(configProperties.getCameraConfig().getCameraType() == 1 && !StringUtils.isEmpty(warnVO.getVideoPath2())){ warnVO.setCmd1(" VSPlayer "+ warnVO.getVideoPath2()); } } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java index b9f6173..44d121d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java @@ -1,7 +1,6 @@ package com.zhehekeji.web.service.ksec; import com.alibaba.fastjson.JSONObject; -import com.zhehekeji.web.service.SendHeart; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; diff --git a/web/src/main/java/com/zhehekeji/web/service/HeartNettyClientFilter.java b/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/HeartNettyClientFilter.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java index e33311f..c45b3f9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/HeartNettyClientFilter.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientFilter.java @@ -1,5 +1,6 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; +import com.zhehekeji.web.service.PlcService; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; @@ -7,8 +8,6 @@ import io.netty.handler.timeout.IdleStateHandler; import java.util.concurrent.TimeUnit; -import static java.nio.ByteOrder.BIG_ENDIAN; - /** * 客户端过滤器，编解码和心跳的设置 * @@ -38,8 +37,8 @@ public class HeartNettyClientFilter extends ChannelInitializer { ChannelPipeline ph = ch.pipeline(); //4秒发一次心跳 ph.addLast(new IdleStateHandler(0, 4, 0, TimeUnit.SECONDS)); - ph.addLast(new MyProtocolDecoder(plcService)); - ph.addLast(new MyProtocolEncoder()); + ph.addLast(new ProtocolDecoder(plcService)); + ph.addLast(new ProtocolEncoder()); ph.addLast(new HeartNettyClientHandler(streetId,sendHeart,nettyClient)); } } diff --git a/web/src/main/java/com/zhehekeji/web/service/HeartNettyClientHandler.java b/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java similarity index 95% rename from web/src/main/java/com/zhehekeji/web/service/HeartNettyClientHandler.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java index ddb6b21..8c24a02 100644 --- a/web/src/main/java/com/zhehekeji/web/service/HeartNettyClientHandler.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/HeartNettyClientHandler.java @@ -1,5 +1,6 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; +import com.zhehekeji.web.service.StreetConn; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.timeout.IdleStateEvent; diff --git a/web/src/main/java/com/zhehekeji/web/service/NettyClient.java b/web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java similarity index 96% rename from web/src/main/java/com/zhehekeji/web/service/NettyClient.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java index be2c4bb..fe32e18 100644 --- a/web/src/main/java/com/zhehekeji/web/service/NettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/NettyClient.java @@ -1,7 +1,8 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.StreetMapper; +import com.zhehekeji.web.service.PlcService; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java similarity index 93% rename from web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java index 43502f1..c7c08bd 100644 --- a/web/src/main/java/com/zhehekeji/web/service/MyProtocolDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolDecoder.java @@ -1,5 +1,8 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; +import com.zhehekeji.web.service.OrderAction; +import com.zhehekeji.web.service.PlcOrderInfo; +import com.zhehekeji.web.service.PlcService; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.FixedLengthFrameDecoder; @@ -9,11 +12,11 @@ import java.nio.charset.Charset; @Slf4j -public class MyProtocolDecoder extends FixedLengthFrameDecoder { +public class ProtocolDecoder extends FixedLengthFrameDecoder { private PlcService plcService; - public MyProtocolDecoder(PlcService plcService) { + public ProtocolDecoder(PlcService plcService) { super(43); this.plcService = plcService; } @@ -105,7 +108,7 @@ public class MyProtocolDecoder extends FixedLengthFrameDecoder { log.info("随行模式"); } else { log.info("盘点模式"); - log.info("Verification mode. Code:{}, box number(system):{}, box number(algorithm):{}", barCodeSys, boxNumSys, boxNumAlgo); + log.info("Verification mode. Code er(algorithm):{}", barCodeSys, boxNumSys, boxNumAlgo); plcService.recordStock(plcOrderInfo,plcId,barCodeSys,boxNumSys,boxNumAlgo); } @@ -118,6 +121,7 @@ public class MyProtocolDecoder extends FixedLengthFrameDecoder { //执行动作 plcService.action(plcOrderInfo, plcId, times, code); } else if(code.equals("C7")){ + // C7 C8已废除，这里只兼容robotic 试点项目 //旋转360 然后发送C8命令 plcService.turn360AndC8(plcId); }else { diff --git a/web/src/main/java/com/zhehekeji/web/service/MyProtocolEncoder.java b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java similarity index 85% rename from web/src/main/java/com/zhehekeji/web/service/MyProtocolEncoder.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java index d7cd4b5..8e06e4d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/MyProtocolEncoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/ProtocolEncoder.java @@ -1,12 +1,10 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import java.nio.charset.Charset; - -public class MyProtocolEncoder extends MessageToByteEncoder { +public class ProtocolEncoder extends MessageToByteEncoder { @Override protected void encode(ChannelHandlerContext ctx, SendHeart msg, ByteBuf out) throws Exception { diff --git a/web/src/main/java/com/zhehekeji/web/service/SendHeart.java b/web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java similarity index 94% rename from web/src/main/java/com/zhehekeji/web/service/SendHeart.java rename to web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java index 26302f1..7c845c1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/SendHeart.java +++ b/web/src/main/java/com/zhehekeji/web/service/robotic/SendHeart.java @@ -1,4 +1,4 @@ -package com.zhehekeji.web.service; +package com.zhehekeji.web.service.robotic; import lombok.Data; diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 0f49ef6..8cd6e64 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -37,19 +37,25 @@ server: userUrl: http://115.236.65.98:11001 # ----------- # ----默认摄像头的连接信息 -cameraPassword: admin123 -cameraUser: admin -cameraPort: 37777 +cameraConfig: + # ------------球機選擇--- 0:中威 1：海康 + cameraType: 0 + cameraPassword: admin123 + cameraUser: admin + cameraPort: 37777 # ------------ # -----图片 mp4下载地址 -mediaPath: d:\\data\media\ -mp4Path: d:\\data\mp4\ -# ------------球機選擇--- 0:中威 1：海康 -cameraType: 1 -# ------------服务端类型 0：TCP 1:JSON +savePath: + mediaPath: d:\\data\media\ + mp4Path: d:\\data\mp4\ +# ------------服务端类型 0：TCP(罗伯泰克) 1:JSON（昆船） serverMode: 1 # ------------ 实时视频流 全部页面的格式 行列数量 -videoStyleRow: 2 -videoStyleColumn: 2 +videoStyleConfig: + videoStyleRow: 2 + videoStyleColumn: 2 # ------------球机m3u8默认地址 %d是球机数据库id，如果数据库没有，就使用此默认值 mediaServer: http://127.0.0.1:9080/hls/camera%d.m3u8 +rtcServer: + rtcServerIp: 127.0.0.1 + rtcServerPort: 8083