diff --git a/libs/encrypt/Encryptor.dll b/libs/encrypt/Encryptor.dll deleted file mode 100644 index edee19a..0000000 Binary files a/libs/encrypt/Encryptor.dll and /dev/null differ diff --git a/libs/linux64/dh/libImageAlg.so b/libs/linux64/dh/libImageAlg.so new file mode 100644 index 0000000..00b1df2 Binary files /dev/null and b/libs/linux64/dh/libImageAlg.so differ diff --git a/libs/linux64/dh/libStreamConvertor.so b/libs/linux64/dh/libStreamConvertor.so new file mode 100644 index 0000000..e34a645 Binary files /dev/null and b/libs/linux64/dh/libStreamConvertor.so differ diff --git a/libs/linux64/dh/libavnetsdk.so b/libs/linux64/dh/libavnetsdk.so new file mode 100644 index 0000000..6e04490 Binary files /dev/null and b/libs/linux64/dh/libavnetsdk.so differ diff --git a/libs/linux64/dh/libcrypto.so b/libs/linux64/dh/libcrypto.so new file mode 100644 index 0000000..63cdf89 Binary files /dev/null and b/libs/linux64/dh/libcrypto.so differ diff --git a/libs/linux64/dh/libdhconfigsdk.so b/libs/linux64/dh/libdhconfigsdk.so new file mode 100644 index 0000000..8c3c351 Binary files /dev/null and b/libs/linux64/dh/libdhconfigsdk.so differ diff --git a/libs/linux64/dh/libdhnetsdk.so b/libs/linux64/dh/libdhnetsdk.so new file mode 100644 index 0000000..d786238 Binary files /dev/null and b/libs/linux64/dh/libdhnetsdk.so differ diff --git a/libs/linux64/dh/libssl.so b/libs/linux64/dh/libssl.so new file mode 100644 index 0000000..93d0d40 Binary files /dev/null and b/libs/linux64/dh/libssl.so differ diff --git a/libs/linux64/hik/HCNetSDK_Log_Switch.xml b/libs/linux64/hik/HCNetSDK_Log_Switch.xml new file mode 100644 index 0000000..8b7e236 --- /dev/null +++ b/libs/linux64/hik/HCNetSDK_Log_Switch.xml @@ -0,0 +1,12 @@ + + + + 3 + ./SDKLOG/ + true + + + 120 + 1 + + \ No newline at end of file diff --git a/libs/linux64/hik/libAudioRender.so b/libs/linux64/hik/libAudioRender.so new file mode 100644 index 0000000..f39a4a1 Binary files /dev/null and b/libs/linux64/hik/libAudioRender.so differ diff --git a/libs/linux64/hik/libHCCore.so b/libs/linux64/hik/libHCCore.so new file mode 100644 index 0000000..7846902 Binary files /dev/null and b/libs/linux64/hik/libHCCore.so differ diff --git a/libs/linux64/hik/libNPQos.so b/libs/linux64/hik/libNPQos.so new file mode 100644 index 0000000..4972715 Binary files /dev/null and b/libs/linux64/hik/libNPQos.so differ diff --git a/libs/linux64/hik/libPlayCtrl.so b/libs/linux64/hik/libPlayCtrl.so new file mode 100644 index 0000000..e255c22 Binary files /dev/null and b/libs/linux64/hik/libPlayCtrl.so differ diff --git a/libs/linux64/hik/libSuperRender.so b/libs/linux64/hik/libSuperRender.so new file mode 100644 index 0000000..3f36846 Binary files /dev/null and b/libs/linux64/hik/libSuperRender.so differ diff --git a/libs/linux64/hik/libcrypto.so.1.1 b/libs/linux64/hik/libcrypto.so.1.1 new file mode 100644 index 0000000..88c3746 Binary files /dev/null and b/libs/linux64/hik/libcrypto.so.1.1 differ diff --git a/libs/linux64/hik/libhcnetsdk.so b/libs/linux64/hik/libhcnetsdk.so new file mode 100644 index 0000000..2607cee Binary files /dev/null and b/libs/linux64/hik/libhcnetsdk.so differ diff --git a/libs/linux64/hik/libhpr.so b/libs/linux64/hik/libhpr.so new file mode 100644 index 0000000..8efcabb Binary files /dev/null and b/libs/linux64/hik/libhpr.so differ diff --git a/libs/linux64/hik/libopenal.so.1 b/libs/linux64/hik/libopenal.so.1 new file mode 100644 index 0000000..a9dcb82 Binary files /dev/null and b/libs/linux64/hik/libopenal.so.1 differ diff --git a/libs/linux64/hik/libssl.so.1.1 b/libs/linux64/hik/libssl.so.1.1 new file mode 100644 index 0000000..f3e4481 Binary files /dev/null and b/libs/linux64/hik/libssl.so.1.1 differ diff --git a/libs/linux64/hik/libz.so b/libs/linux64/hik/libz.so new file mode 100644 index 0000000..13b4ed9 Binary files /dev/null and b/libs/linux64/hik/libz.so differ diff --git a/libs/hik/ImageAlg.dll b/libs/win64/dh/ImageAlg.dll similarity index 100% rename from libs/hik/ImageAlg.dll rename to libs/win64/dh/ImageAlg.dll diff --git a/libs/hik/Infra.dll b/libs/win64/dh/Infra.dll similarity index 100% rename from libs/hik/Infra.dll rename to libs/win64/dh/Infra.dll diff --git a/libs/hik/IvsDrawer.dll b/libs/win64/dh/IvsDrawer.dll similarity index 100% rename from libs/hik/IvsDrawer.dll rename to libs/win64/dh/IvsDrawer.dll diff --git a/libs/hik/IvsDrawer.h b/libs/win64/dh/IvsDrawer.h similarity index 100% rename from libs/hik/IvsDrawer.h rename to libs/win64/dh/IvsDrawer.h diff --git a/libs/hik/Json.dll b/libs/win64/dh/Json.dll similarity index 100% rename from libs/hik/Json.dll rename to libs/win64/dh/Json.dll diff --git a/libs/hik/NetFramework.dll b/libs/win64/dh/NetFramework.dll similarity index 100% rename from libs/hik/NetFramework.dll rename to libs/win64/dh/NetFramework.dll diff --git a/libs/hik/Stream.dll b/libs/win64/dh/Stream.dll similarity index 100% rename from libs/hik/Stream.dll rename to libs/win64/dh/Stream.dll diff --git a/libs/hik/StreamConvertor.dll b/libs/win64/dh/StreamConvertor.dll similarity index 100% rename from libs/hik/StreamConvertor.dll rename to libs/win64/dh/StreamConvertor.dll diff --git a/libs/hik/StreamSvr.dll b/libs/win64/dh/StreamSvr.dll similarity index 100% rename from libs/hik/StreamSvr.dll rename to libs/win64/dh/StreamSvr.dll diff --git a/libs/hik/avglobal.h b/libs/win64/dh/avglobal.h similarity index 100% rename from libs/hik/avglobal.h rename to libs/win64/dh/avglobal.h diff --git a/libs/hik/avnetsdk.dll b/libs/win64/dh/avnetsdk.dll similarity index 100% rename from libs/hik/avnetsdk.dll rename to libs/win64/dh/avnetsdk.dll diff --git a/libs/hik/dhconfigsdk.dll b/libs/win64/dh/dhconfigsdk.dll similarity index 100% rename from libs/hik/dhconfigsdk.dll rename to libs/win64/dh/dhconfigsdk.dll diff --git a/libs/hik/dhconfigsdk.h b/libs/win64/dh/dhconfigsdk.h similarity index 100% rename from libs/hik/dhconfigsdk.h rename to libs/win64/dh/dhconfigsdk.h diff --git a/libs/hik/dhnetsdk.dll b/libs/win64/dh/dhnetsdk.dll similarity index 100% rename from libs/hik/dhnetsdk.dll rename to libs/win64/dh/dhnetsdk.dll diff --git a/libs/hik/dhnetsdk.h b/libs/win64/dh/dhnetsdk.h similarity index 100% rename from libs/hik/dhnetsdk.h rename to libs/win64/dh/dhnetsdk.h diff --git a/libs/hik/dhplay.dll b/libs/win64/dh/dhplay.dll similarity index 100% rename from libs/hik/dhplay.dll rename to libs/win64/dh/dhplay.dll diff --git a/libs/hik/fisheye.dll b/libs/win64/dh/fisheye.dll similarity index 100% rename from libs/hik/fisheye.dll rename to libs/win64/dh/fisheye.dll diff --git a/libs/hik/AudioRender.dll b/libs/win64/hik/AudioRender.dll similarity index 100% rename from libs/hik/AudioRender.dll rename to libs/win64/hik/AudioRender.dll diff --git a/libs/hik/DemoLocalCfg.json b/libs/win64/hik/DemoLocalCfg.json similarity index 100% rename from libs/hik/DemoLocalCfg.json rename to libs/win64/hik/DemoLocalCfg.json diff --git a/libs/hik/DeviceCfg.json b/libs/win64/hik/DeviceCfg.json similarity index 100% rename from libs/hik/DeviceCfg.json rename to libs/win64/hik/DeviceCfg.json diff --git a/libs/hik/GdiPlus.dll b/libs/win64/hik/GdiPlus.dll similarity index 100% rename from libs/hik/GdiPlus.dll rename to libs/win64/hik/GdiPlus.dll diff --git a/libs/hik/GdiPlus.lib b/libs/win64/hik/GdiPlus.lib similarity index 100% rename from libs/hik/GdiPlus.lib rename to libs/win64/hik/GdiPlus.lib diff --git a/libs/hik/HCCore.dll b/libs/win64/hik/HCCore.dll similarity index 100% rename from libs/hik/HCCore.dll rename to libs/win64/hik/HCCore.dll diff --git a/libs/hik/HCCore.lib b/libs/win64/hik/HCCore.lib similarity index 100% rename from libs/hik/HCCore.lib rename to libs/win64/hik/HCCore.lib diff --git a/libs/hik/HCNetSDK.dll b/libs/win64/hik/HCNetSDK.dll similarity index 100% rename from libs/hik/HCNetSDK.dll rename to libs/win64/hik/HCNetSDK.dll diff --git a/libs/hik/HCNetSDK.lib b/libs/win64/hik/HCNetSDK.lib similarity index 100% rename from libs/hik/HCNetSDK.lib rename to libs/win64/hik/HCNetSDK.lib diff --git a/libs/hik/HCNetSDKCom/AnalyzeData.dll b/libs/win64/hik/HCNetSDKCom/AnalyzeData.dll similarity index 100% rename from libs/hik/HCNetSDKCom/AnalyzeData.dll rename to libs/win64/hik/HCNetSDKCom/AnalyzeData.dll diff --git a/libs/hik/HCNetSDKCom/AudioIntercom.dll b/libs/win64/hik/HCNetSDKCom/AudioIntercom.dll similarity index 100% rename from libs/hik/HCNetSDKCom/AudioIntercom.dll rename to libs/win64/hik/HCNetSDKCom/AudioIntercom.dll diff --git a/libs/hik/HCNetSDKCom/AudioRender.dll b/libs/win64/hik/HCNetSDKCom/AudioRender.dll similarity index 100% rename from libs/hik/HCNetSDKCom/AudioRender.dll rename to libs/win64/hik/HCNetSDKCom/AudioRender.dll diff --git a/libs/hik/HCNetSDKCom/HCAlarm.dll b/libs/win64/hik/HCNetSDKCom/HCAlarm.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCAlarm.dll rename to libs/win64/hik/HCNetSDKCom/HCAlarm.dll diff --git a/libs/hik/HCNetSDKCom/HCAlarm.lib b/libs/win64/hik/HCNetSDKCom/HCAlarm.lib similarity index 100% rename from libs/hik/HCNetSDKCom/HCAlarm.lib rename to libs/win64/hik/HCNetSDKCom/HCAlarm.lib diff --git a/libs/hik/HCNetSDKCom/HCCoreDevCfg.dll b/libs/win64/hik/HCNetSDKCom/HCCoreDevCfg.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCCoreDevCfg.dll rename to libs/win64/hik/HCNetSDKCom/HCCoreDevCfg.dll diff --git a/libs/hik/HCNetSDKCom/HCDisplay.dll b/libs/win64/hik/HCNetSDKCom/HCDisplay.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCDisplay.dll rename to libs/win64/hik/HCNetSDKCom/HCDisplay.dll diff --git a/libs/hik/HCNetSDKCom/HCGeneralCfgMgr.dll b/libs/win64/hik/HCNetSDKCom/HCGeneralCfgMgr.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCGeneralCfgMgr.dll rename to libs/win64/hik/HCNetSDKCom/HCGeneralCfgMgr.dll diff --git a/libs/hik/HCNetSDKCom/HCGeneralCfgMgr.lib b/libs/win64/hik/HCNetSDKCom/HCGeneralCfgMgr.lib similarity index 100% rename from libs/hik/HCNetSDKCom/HCGeneralCfgMgr.lib rename to libs/win64/hik/HCNetSDKCom/HCGeneralCfgMgr.lib diff --git a/libs/hik/HCNetSDKCom/HCIndustry.dll b/libs/win64/hik/HCNetSDKCom/HCIndustry.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCIndustry.dll rename to libs/win64/hik/HCNetSDKCom/HCIndustry.dll diff --git a/libs/hik/HCNetSDKCom/HCPlayBack.dll b/libs/win64/hik/HCNetSDKCom/HCPlayBack.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCPlayBack.dll rename to libs/win64/hik/HCNetSDKCom/HCPlayBack.dll diff --git a/libs/hik/HCNetSDKCom/HCPreview.dll b/libs/win64/hik/HCNetSDKCom/HCPreview.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCPreview.dll rename to libs/win64/hik/HCNetSDKCom/HCPreview.dll diff --git a/libs/hik/HCNetSDKCom/HCPreview.lib b/libs/win64/hik/HCNetSDKCom/HCPreview.lib similarity index 100% rename from libs/hik/HCNetSDKCom/HCPreview.lib rename to libs/win64/hik/HCNetSDKCom/HCPreview.lib diff --git a/libs/hik/HCNetSDKCom/HCVoiceTalk.dll b/libs/win64/hik/HCNetSDKCom/HCVoiceTalk.dll similarity index 100% rename from libs/hik/HCNetSDKCom/HCVoiceTalk.dll rename to libs/win64/hik/HCNetSDKCom/HCVoiceTalk.dll diff --git a/libs/hik/HCNetSDKCom/OpenAL32.dll b/libs/win64/hik/HCNetSDKCom/OpenAL32.dll similarity index 100% rename from libs/hik/HCNetSDKCom/OpenAL32.dll rename to libs/win64/hik/HCNetSDKCom/OpenAL32.dll diff --git a/libs/hik/HCNetSDKCom/StreamTransClient.dll b/libs/win64/hik/HCNetSDKCom/StreamTransClient.dll similarity index 100% rename from libs/hik/HCNetSDKCom/StreamTransClient.dll rename to libs/win64/hik/HCNetSDKCom/StreamTransClient.dll diff --git a/libs/hik/HCNetSDKCom/SystemTransform.dll b/libs/win64/hik/HCNetSDKCom/SystemTransform.dll similarity index 100% rename from libs/hik/HCNetSDKCom/SystemTransform.dll rename to libs/win64/hik/HCNetSDKCom/SystemTransform.dll diff --git a/libs/hik/HCNetSDKCom/libiconv2.dll b/libs/win64/hik/HCNetSDKCom/libiconv2.dll similarity index 100% rename from libs/hik/HCNetSDKCom/libiconv2.dll rename to libs/win64/hik/HCNetSDKCom/libiconv2.dll diff --git a/libs/hik/HXVA.dll b/libs/win64/hik/HXVA.dll similarity index 100% rename from libs/hik/HXVA.dll rename to libs/win64/hik/HXVA.dll diff --git a/libs/hik/HmMerge.dll b/libs/win64/hik/HmMerge.dll similarity index 100% rename from libs/hik/HmMerge.dll rename to libs/win64/hik/HmMerge.dll diff --git a/libs/win64/ImageAlg.dll b/libs/win64/hik/ImageAlg.dll similarity index 100% rename from libs/win64/ImageAlg.dll rename to libs/win64/hik/ImageAlg.dll diff --git a/libs/win64/Infra.dll b/libs/win64/hik/Infra.dll similarity index 100% rename from libs/win64/Infra.dll rename to libs/win64/hik/Infra.dll diff --git a/libs/win64/IvsDrawer.dll b/libs/win64/hik/IvsDrawer.dll similarity index 100% rename from libs/win64/IvsDrawer.dll rename to libs/win64/hik/IvsDrawer.dll diff --git a/libs/win64/IvsDrawer.h b/libs/win64/hik/IvsDrawer.h similarity index 100% rename from libs/win64/IvsDrawer.h rename to libs/win64/hik/IvsDrawer.h diff --git a/libs/win64/Json.dll b/libs/win64/hik/Json.dll similarity index 100% rename from libs/win64/Json.dll rename to libs/win64/hik/Json.dll diff --git a/libs/hik/LocalSensorAdd.dat b/libs/win64/hik/LocalSensorAdd.dat similarity index 100% rename from libs/hik/LocalSensorAdd.dat rename to libs/win64/hik/LocalSensorAdd.dat diff --git a/libs/hik/MP_Render.dll b/libs/win64/hik/MP_Render.dll similarity index 100% rename from libs/hik/MP_Render.dll rename to libs/win64/hik/MP_Render.dll diff --git a/libs/hik/NPQos.dll b/libs/win64/hik/NPQos.dll similarity index 100% rename from libs/hik/NPQos.dll rename to libs/win64/hik/NPQos.dll diff --git a/libs/win64/NetFramework.dll b/libs/win64/hik/NetFramework.dll similarity index 100% rename from libs/win64/NetFramework.dll rename to libs/win64/hik/NetFramework.dll diff --git a/libs/hik/OpenAL32.dll b/libs/win64/hik/OpenAL32.dll similarity index 100% rename from libs/hik/OpenAL32.dll rename to libs/win64/hik/OpenAL32.dll diff --git a/libs/hik/PlayCtrl.dll b/libs/win64/hik/PlayCtrl.dll similarity index 100% rename from libs/hik/PlayCtrl.dll rename to libs/win64/hik/PlayCtrl.dll diff --git a/libs/hik/PlayCtrl.lib b/libs/win64/hik/PlayCtrl.lib similarity index 100% rename from libs/hik/PlayCtrl.lib rename to libs/win64/hik/PlayCtrl.lib diff --git a/libs/win64/Stream.dll b/libs/win64/hik/Stream.dll similarity index 100% rename from libs/win64/Stream.dll rename to libs/win64/hik/Stream.dll diff --git a/libs/win64/StreamConvertor.dll b/libs/win64/hik/StreamConvertor.dll similarity index 100% rename from libs/win64/StreamConvertor.dll rename to libs/win64/hik/StreamConvertor.dll diff --git a/libs/win64/StreamSvr.dll b/libs/win64/hik/StreamSvr.dll similarity index 100% rename from libs/win64/StreamSvr.dll rename to libs/win64/hik/StreamSvr.dll diff --git a/libs/hik/SuperRender.dll b/libs/win64/hik/SuperRender.dll similarity index 100% rename from libs/hik/SuperRender.dll rename to libs/win64/hik/SuperRender.dll diff --git a/libs/hik/YUVProcess.dll b/libs/win64/hik/YUVProcess.dll similarity index 100% rename from libs/hik/YUVProcess.dll rename to libs/win64/hik/YUVProcess.dll diff --git a/libs/win64/avglobal.h b/libs/win64/hik/avglobal.h similarity index 100% rename from libs/win64/avglobal.h rename to libs/win64/hik/avglobal.h diff --git a/libs/win64/avnetsdk.dll b/libs/win64/hik/avnetsdk.dll similarity index 100% rename from libs/win64/avnetsdk.dll rename to libs/win64/hik/avnetsdk.dll diff --git a/libs/win64/dhconfigsdk.dll b/libs/win64/hik/dhconfigsdk.dll similarity index 100% rename from libs/win64/dhconfigsdk.dll rename to libs/win64/hik/dhconfigsdk.dll diff --git a/libs/win64/dhconfigsdk.h b/libs/win64/hik/dhconfigsdk.h similarity index 100% rename from libs/win64/dhconfigsdk.h rename to libs/win64/hik/dhconfigsdk.h diff --git a/libs/win64/dhnetsdk.dll b/libs/win64/hik/dhnetsdk.dll similarity index 100% rename from libs/win64/dhnetsdk.dll rename to libs/win64/hik/dhnetsdk.dll diff --git a/libs/win64/dhnetsdk.h b/libs/win64/hik/dhnetsdk.h similarity index 100% rename from libs/win64/dhnetsdk.h rename to libs/win64/hik/dhnetsdk.h diff --git a/libs/win64/dhplay.dll b/libs/win64/hik/dhplay.dll similarity index 100% rename from libs/win64/dhplay.dll rename to libs/win64/hik/dhplay.dll diff --git a/libs/win64/fisheye.dll b/libs/win64/hik/fisheye.dll similarity index 100% rename from libs/win64/fisheye.dll rename to libs/win64/hik/fisheye.dll diff --git a/libs/hik/hlog.dll b/libs/win64/hik/hlog.dll similarity index 100% rename from libs/hik/hlog.dll rename to libs/win64/hik/hlog.dll diff --git a/libs/hik/hpr.dll b/libs/win64/hik/hpr.dll similarity index 100% rename from libs/hik/hpr.dll rename to libs/win64/hik/hpr.dll diff --git a/libs/hik/libeay32.dll b/libs/win64/hik/libeay32.dll similarity index 100% rename from libs/hik/libeay32.dll rename to libs/win64/hik/libeay32.dll diff --git a/libs/hik/libmmd.dll b/libs/win64/hik/libmmd.dll similarity index 100% rename from libs/hik/libmmd.dll rename to libs/win64/hik/libmmd.dll diff --git a/libs/hik/log4cxx.properties b/libs/win64/hik/log4cxx.properties similarity index 100% rename from libs/hik/log4cxx.properties rename to libs/win64/hik/log4cxx.properties diff --git a/libs/hik/ssleay32.dll b/libs/win64/hik/ssleay32.dll similarity index 100% rename from libs/hik/ssleay32.dll rename to libs/win64/hik/ssleay32.dll diff --git a/libs/hik/zlib1.dll b/libs/win64/hik/zlib1.dll similarity index 100% rename from libs/hik/zlib1.dll rename to libs/win64/hik/zlib1.dll diff --git a/yudao-module-camera/yudao-module-camera-biz/pom.xml b/yudao-module-camera/yudao-module-camera-biz/pom.xml index c172717..a45d24c 100644 --- a/yudao-module-camera/yudao-module-camera-biz/pom.xml +++ b/yudao-module-camera/yudao-module-camera-biz/pom.xml @@ -27,13 +27,7 @@ yudao-module-infra-api ${revision} - - gnu.io - SerialPort - 1.0 - system - ${project.basedir}/src/main/resources/libs/rxtx-2.1.7.jar - + com.sun.jna @@ -50,13 +44,6 @@ system ${project.basedir}/src/main/resources/libs/examples.jar - - gnu.io - SerialPort - 1.0 - system - ${project.basedir}/src/main/resources/libs/rxtx-2.1.7.jar - diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/dal/mysql/cameraioconfig/CameraIoConfigMapper.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/dal/mysql/cameraioconfig/CameraIoConfigMapper.java index 80b0de6..6056537 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/dal/mysql/cameraioconfig/CameraIoConfigMapper.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/dal/mysql/cameraioconfig/CameraIoConfigMapper.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.camera.dal.mysql.cameraioconfig; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.camera.dal.dataobject.cameraioconfig.CameraIoConfigDO; +import cn.iocoder.yudao.module.camera.vo.CameraIoConfigPageReqVO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.camera.controller.admin.cameraioconfig.vo.*; /** * 棰勭疆鐐逛綅閰嶇疆 Mapper diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/demo/module/ThermalCameraModule.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/demo/module/ThermalCameraModule.java index 2104648..e69de29 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/demo/module/ThermalCameraModule.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/demo/module/ThermalCameraModule.java @@ -1,305 +0,0 @@ -package cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.demo.module; - -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.ImageAlgLib; -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.NetSDKLib; -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.NetSDKLib.*; -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.ToolKits; -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.structure.NET_IN_RADIOMETRY_RANDOM_REGION_TEMPER; -import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.structure.NET_OUT_RADIOMETRY_RANDOM_REGION_TEMPER; - -import java.io.IOException; - -public class ThermalCameraModule { - - static ImageAlgLib imageAlgApi = ImageAlgLib.IMAGEALG_INSTANCE; - - public static class ThermalCameraStatus { - public boolean bSearching = false; // 鏄惁姝ｅ湪鏌ユ壘 - public int nFinderHanle; // 鍙栧埌鐨勬煡璇㈠彞鏌 - public int nTotalCount; // 绗﹀悎姝ゆ鏌ヨ鏉′欢鐨勭粨鏋滄绘潯鏁 - public LLong hRadiometryHandle = new LLong(0); // 璁㈤槄鍙ユ焺 - } - - private static ThermalCameraStatus status = new ThermalCameraStatus(); - - /** - * 璁㈤槄娓╁害鍒嗗竷鏁版嵁锛堢儹鍥撅級 - */ - public static boolean radiometryAttach(int nChannel, fRadiometryAttachCB cbNotify) { - /* - * 鍏ュ弬 - */ - NET_IN_RADIOMETRY_ATTACH stIn = new NET_IN_RADIOMETRY_ATTACH(); - stIn.nChannel = nChannel; // 閫氶亾鍙 - stIn.cbNotify = cbNotify; // 鍥炶皟鍑芥暟 - - /* - * 鍑哄弬 - */ - NET_OUT_RADIOMETRY_ATTACH stOut = new NET_OUT_RADIOMETRY_ATTACH(); - status.hRadiometryHandle = LoginModule.netsdk.CLIENT_RadiometryAttach(LoginModule.m_hLoginHandle, stIn, stOut, 3000); - - if(status.hRadiometryHandle.longValue() == 0) { - System.err.printf("RadiometryAttach Failed!" + ToolKits.getErrorCodePrint()); - } - - return status.hRadiometryHandle.longValue() != 0; - } - - /** - * 鑾峰彇鏌ヨ鎬讳釜鏁 - */ - public static boolean isAttaching() { - return status.hRadiometryHandle.longValue() != 0; - } - - /** - * 寮濮嬭幏鍙栫儹鍥炬暟鎹 - */ - public static int radiometryFetch(int nChannel) { - - int nStatus = -1; - - /* - * 鍏ュ弬 - */ - NET_IN_RADIOMETRY_FETCH stIn = new NET_IN_RADIOMETRY_FETCH(); - stIn.nChannel = nChannel; // 閫氶亾鍙 - - /* - * 鍑哄弬 - */ - NET_OUT_RADIOMETRY_FETCH stOut = new NET_OUT_RADIOMETRY_FETCH(); - - if(!LoginModule.netsdk.CLIENT_RadiometryFetch(LoginModule.m_hLoginHandle, stIn, stOut, 3000)) { - System.err.printf("RadiometryFetch Failed!" + ToolKits.getErrorCodePrint()); - } else { - nStatus = stOut.nStatus; - } - - return nStatus; - } - - /** - * 澶勭悊鍥炶皟鏁版嵁锛堢儹鍥撅級 - * @throws IOException - */ - public static boolean saveData(NET_RADIOMETRY_DATA radiometryData) throws IOException { - - if (radiometryData == null) { - return false; - } - - int nWidth = radiometryData.stMetaData.nWidth; - int nHeight = radiometryData.stMetaData.nHeight; - - short[] pGrayImg = new short[nWidth * nHeight]; - float[] pTempForPixels = new float[nWidth * nHeight]; - - if(LoginModule.netsdk.CLIENT_RadiometryDataParse(radiometryData, pGrayImg, pTempForPixels)) { - byte[] pYData = new byte[nWidth*nHeight*2]; - imageAlgApi.drcTable(pGrayImg, (short)nWidth, (short)nHeight, 0, pYData, null); - ToolKits.savePicture(pYData, "./GrayscaleMap.yuv"); - } else { - System.err.println("saveData failed!" + ToolKits.getErrorCodePrint()); - return false; - } - - return true; - } - - /** - * 鍙栨秷璁㈤槄娓╁害鍒嗗竷鏁版嵁 - */ - public static void radiometryDetach() { - if(status.hRadiometryHandle.longValue() != 0) { - LoginModule.netsdk.CLIENT_RadiometryDetach(status.hRadiometryHandle); - status.hRadiometryHandle.setValue(0); - } - } - - /** - * 鏌ヨ娴嬫俯鐐 - */ - public static NET_RADIOMETRYINFO queryPointTemper(int nChannel, short x, short y) { - int nQueryType = NetSDKLib.NET_QUERY_DEV_RADIOMETRY_POINT_TEMPER; - - // 鍏ュ弬 - NET_IN_RADIOMETRY_GETPOINTTEMPER stIn = new NET_IN_RADIOMETRY_GETPOINTTEMPER(); - stIn.nChannel = nChannel; - stIn.stCoordinate.nx = x; - stIn.stCoordinate.ny = y; - - // 鍑哄弬 - NET_OUT_RADIOMETRY_GETPOINTTEMPER stOut = new NET_OUT_RADIOMETRY_GETPOINTTEMPER(); - - stIn.write(); - stOut.write(); - boolean bRet = LoginModule.netsdk.CLIENT_QueryDevInfo(LoginModule.m_hLoginHandle, nQueryType, stIn.getPointer(), stOut.getPointer(), null, 3000); - if(!bRet) { - System.err.printf("QueryPointTemper Failed!" + ToolKits.getErrorCodePrint()); - return null; - } - - stOut.read(); - return stOut.stPointTempInfo; - } - - - /** - * 鑾峰彇娴嬫俯鍖哄煙 - */ - public static NET_OUT_RADIOMETRY_RANDOM_REGION_TEMPER radiometryGetRandomRegionTemper(int channel, int pointNum, short[][] nPoints){ - - NET_IN_RADIOMETRY_RANDOM_REGION_TEMPER stIn = new NET_IN_RADIOMETRY_RANDOM_REGION_TEMPER(); - NET_OUT_RADIOMETRY_RANDOM_REGION_TEMPER stOut = new NET_OUT_RADIOMETRY_RANDOM_REGION_TEMPER(); - stIn.nChannel = channel; - stIn.nPointNum = pointNum; - for(int i = 0;i < pointNum;i++){ - stIn.stuPolygon[i].nx = nPoints[i][0]; - stIn.stuPolygon[i].ny = nPoints[i][1]; - } - - stIn.write(); - stOut.write(); - - boolean bet = LoginModule.netsdk.CLIENT_RadiometryGetRandomRegionTemper(LoginModule.m_hLoginHandle,stIn.getPointer(),stOut.getPointer(), 3000); - - stIn.read(); - stOut.read(); - - if(bet) { - - }else { - System.err.println("鑾峰彇娴嬫俯鍖哄煙鐨勫弬鏁板煎け璐," + ToolKits.getErrorCodePrint()); - } - return stOut; - } - - /** - * 鏌ヨ娴嬫俯椤 - */ - public static NET_RADIOMETRYINFO queryItemTemper(int nChannel, int nPresetId, int nRuleId, int nMeterType) { - int nQueryType = NetSDKLib.NET_QUERY_DEV_RADIOMETRY_TEMPER; - - // 鍏ュ弬 - NET_IN_RADIOMETRY_GETTEMPER stIn = new NET_IN_RADIOMETRY_GETTEMPER(); - stIn.stCondition.nPresetId = nPresetId; - stIn.stCondition.nRuleId = nRuleId; - stIn.stCondition.nMeterType = nMeterType; // eg: NET_RADIOMETRY_METERTYPE.NET_RADIOMETRY_METERTYPE_AREA; - stIn.stCondition.nChannel = nChannel; - - // 鍑哄弬 - NET_OUT_RADIOMETRY_GETTEMPER stOut = new NET_OUT_RADIOMETRY_GETTEMPER(); - - stIn.write(); - stOut.write(); - boolean bRet = LoginModule.netsdk.CLIENT_QueryDevInfo(LoginModule.m_hLoginHandle, nQueryType, stIn.getPointer(), stOut.getPointer(), null, 3000); - if(!bRet) { - System.err.printf("QueryPointTemper Failed!" + ToolKits.getErrorCodePrint()); - return null; - } - - stOut.read(); - return stOut.stTempInfo; - } - - /** - * 寮濮嬫煡璇俊鎭 - */ - public static boolean startFind(NET_IN_RADIOMETRY_STARTFIND stuIn) { - if(status.bSearching) { - stopFind(); - } - - /* - * 鍑哄弬 - */ - NET_OUT_RADIOMETRY_STARTFIND stuOut = new NET_OUT_RADIOMETRY_STARTFIND(); - stuIn.write(); - stuOut.write(); - status.bSearching = LoginModule.netsdk.CLIENT_StartFind(LoginModule.m_hLoginHandle, - NET_FIND.NET_FIND_RADIOMETRY, stuIn.getPointer(), stuOut.getPointer(), 5000); - if (status.bSearching) { - stuOut.read(); - status.nFinderHanle = stuOut.nFinderHanle; - status.nTotalCount = stuOut.nTotalCount; - }else { - System.err.printf("startFind Failed!" + ToolKits.getErrorCodePrint()); - } - - return status.bSearching; - } - - /** - * 鑾峰彇鏌ヨ鎬讳釜鏁 - */ - public static int getTotalCount() { - return status.nTotalCount; - } - - /** - * 鏌ヨ淇℃伅 - */ - public static NET_OUT_RADIOMETRY_DOFIND doFind(int nOffset, int nCount) { - if(!status.bSearching) { - System.err.printf("DoFind Failed! [need startFind]"); - return null; - } - - /* - * 鍏ュ弬 - */ - NET_IN_RADIOMETRY_DOFIND stuIn = new NET_IN_RADIOMETRY_DOFIND(); - stuIn.nFinderHanle = status.nFinderHanle; - stuIn.nBeginNumber = nOffset; - stuIn.nCount = nCount; - - /* - * 鍑哄弬 - */ - NET_OUT_RADIOMETRY_DOFIND stuOut = new NET_OUT_RADIOMETRY_DOFIND(); - - stuIn.write(); - stuOut.write(); - if (!LoginModule.netsdk.CLIENT_DoFind(LoginModule.m_hLoginHandle, - NET_FIND.NET_FIND_RADIOMETRY, stuIn.getPointer(), stuOut.getPointer(), 5000)) { - System.err.printf("DoFind Failed!" + ToolKits.getErrorCodePrint()); - return null; - } - - stuOut.read(); - return stuOut; - } - - /** - * 鍋滄鏌ヨ淇℃伅 - */ - public static void stopFind() { - if(!status.bSearching) { - return; - } - - /* - * 鍏ュ弬 - */ - NET_IN_RADIOMETRY_STOPFIND stuIn = new NET_IN_RADIOMETRY_STOPFIND(); - stuIn.nFinderHanle = status.nFinderHanle; - - /* - * 鍑哄弬 - */ - NET_OUT_RADIOMETRY_STOPFIND stuOut = new NET_OUT_RADIOMETRY_STOPFIND(); - - stuIn.write(); - stuOut.write(); - LoginModule.netsdk.CLIENT_StopFind(LoginModule.m_hLoginHandle, - NET_FIND.NET_FIND_RADIOMETRY, stuIn.getPointer(), stuOut.getPointer(), 5000); - - status.bSearching = false; - status.nFinderHanle = 0; -// status.nTotalCount = 0; - - return; - } -} diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/ImageAlgLib.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/ImageAlgLib.java index cc21a26..e69de29 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/ImageAlgLib.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/ImageAlgLib.java @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.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); - static ImageAlgLib IMAGEALG_INSTANCE = Native.load(LibraryLoad.getLoadLibrary("ImageAlg"), ImageAlgLib.class); - - /******************************************************************************* - * 鍑芥暟鍚 : drcTable - * 鎻 杩 : raw鏁版嵁杞崲鎴怸鏁版嵁 - * 杈 鍏 : - pRaw: 14bit瑁告暟鎹 - * 杈 鍏 : - height: 杈撳叆瑁告暟鎹殑楂 - * 杈 鍏 : - width: 杈撳叆瑁告暟鎹殑瀹 - * 杈 鍏 : - sel: 榛樿濉0 - * 杈 鍏 : - lut: 褰搒el涓1鏃讹紝璇ュ弬鏁颁负鏈湴drc琛紝榛樿濉0 - * 杈 鍑 : pYData锛氳浆鎹㈠悗鐨刌鏁版嵁 - * 杩斿洖鍊 : 0 : 鎴愬姛 - * -1: 澶辫触 - *******************************************************************************/ - int drcTable(short[] pRaw, short width, short height, int sel, byte[] pYData, short[] lut); - -} \ No newline at end of file diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/LibraryLoad.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/LibraryLoad.java index ab4096e..760b94e 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/LibraryLoad.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/LibraryLoad.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib; import com.sun.jna.Platform; +import lombok.extern.slf4j.Slf4j; import java.io.*; @@ -10,6 +11,7 @@ import java.io.*; * @description 鍔ㄦ佸簱鍔犺浇 * @date 2020/11/14 */ +@Slf4j public class LibraryLoad { private static final String ARCH_WINDOWS = "win"; private static final String ARCH_LINUX = "linux"; @@ -50,8 +52,32 @@ public class LibraryLoad { return extractLibrary(libName); } - public static void main(String[] args) { - System.out.println(LibraryLoad.getLoadLibrary("dhnetsdk")); + public static String getLoadDigitLibrary(String type,String sdkName) { + String osName = System.getProperty("os.name").toLowerCase(); + String arch = System.getProperty("os.arch").toLowerCase(); + String libName = "./libs"; + if (osName.contains("win")) { + if (arch.contains("64")) { + // Windows 64浣 + libName = libName + "\\win64\\"+type + "\\" + sdkName; + } else { + // Windows 32浣 + log.error("璇ョ郴缁熼噰鐢ㄦ湭鏀寔鐨32浣嶇郴缁"); + } + } else if (osName.contains("nix") || osName.contains("nux") || osName.contains("mac")) { + if (arch.contains("64")) { + // Linux 64浣 + libName = libName + "/linux64/"+type + "/lib" + sdkName; + } else { + // Linux 32浣 + log.error("璇ョ郴缁熼噰鐢ㄦ湭鏀寔鐨32浣嶇郴缁"); + } + } else { + throw new UnsupportedOperationException("Unsupported OS: " + osName); + } + System.out.printf("[Load %s Path : %s]\n", sdkName,libName); + + return libName; } public static String getLoadLibrary(String library) { diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/NetSDKLib.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/NetSDKLib.java index e72a715..ac90db7 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/NetSDKLib.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/dh/netsdk/lib/NetSDKLib.java @@ -18,9 +18,9 @@ import java.util.List; */ public interface NetSDKLib extends Library { - NetSDKLib NETSDK_INSTANCE = Native.load(LibraryLoad.getLoadLibrary("dhnetsdk"), NetSDKLib.class); + NetSDKLib NETSDK_INSTANCE = Native.load(LibraryLoad.getLoadDigitLibrary("dh","dhnetsdk"), NetSDKLib.class); - NetSDKLib CONFIG_INSTANCE = Native.load(LibraryLoad.getLoadLibrary("dhconfigsdk"), NetSDKLib.class); + NetSDKLib CONFIG_INSTANCE = Native.load(LibraryLoad.getLoadDigitLibrary("dh","dhconfigsdk"), NetSDKLib.class); //NetSDKLib CONFIG_JNI = (NetSDKLib)Native.loadLibrary(util.getLoadLibrary("JNI1.dll"), INetSDK.class); class LLong extends IntegerType { diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/hik/HCNetSDK.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/hik/HCNetSDK.java index 71bc9e9..9f21dd0 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/hik/HCNetSDK.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/lib/camera/hik/HCNetSDK.java @@ -11,13 +11,11 @@ package cn.iocoder.yudao.module.camera.lib.camera.hik; +import cn.iocoder.yudao.module.camera.lib.camera.dh.netsdk.lib.LibraryLoad; import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.Union; -import com.sun.jna.examples.win32.GDI32.RECT; -import com.sun.jna.examples.win32.W32API; -import com.sun.jna.examples.win32.W32API.HWND; import com.sun.jna.ptr.ByteByReference; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.ShortByReference; @@ -32,7 +30,7 @@ import java.util.List; //SDK鎺ュ彛璇存槑,HCNetSDK.dll public interface HCNetSDK extends StdCallLibrary { - HCNetSDK INSTANCE = Native.load(".\\libs\\hik\\HCNetSDK", HCNetSDK.class); + HCNetSDK INSTANCE = Native.load(LibraryLoad.getLoadDigitLibrary("hik","HCNetSDK"), HCNetSDK.class); //HCNetSDK INSTANCE = (HCNetSDK) Native.load(Utils.getLoadLibrary("HCNetSDK"), NetSDKLib.class); //HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary("E:\\Leaper\\robo\\backend-duoji-monitor-1.0.1\\libs\\win64\\HCNetSDK.dll", // HCNetSDK.class); /***瀹忓畾涔***/ @@ -3297,7 +3295,6 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public static class NET_DVR_CLIENTINFO extends Structure { public int lChannel; public int lLinkMode; - public HWND hPlayWnd; public String sMultiCastIP; } @@ -3306,7 +3303,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public int lChannel;//閫氶亾鍙 public int dwStreamType; // 鐮佹祦绫诲瀷锛0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-鐮佹祦3锛3-鐮佹祦4, 4-鐮佹祦5,5-鐮佹祦6,7-鐮佹祦7,8-鐮佹祦8,9-鐮佹祦9,10-鐮佹祦10 public int dwLinkMode;// 0锛歍CP鏂瑰紡,1锛歎DP鏂瑰紡,2锛氬鎾柟寮,3 - RTP鏂瑰紡锛4-RTP/RTSP,5-RSTP/HTTP ,6- HRUDP锛堝彲闈犱紶杈擄級 ,7-RTSP/HTTPS - public HWND hPlayWnd;//鎾斁绐楀彛鐨勫彞鏌,涓篘ULL琛ㄧず涓嶆挱鏀惧浘璞 + public int bBlocked; //0-闈為樆濉炲彇娴, 1-闃诲鍙栨祦, 濡傛灉闃诲SDK鍐呴儴connect澶辫触灏嗕細鏈5s鐨勮秴鏃舵墠鑳藉杩斿洖,涓嶉傚悎浜庤疆璇㈠彇娴佹搷浣. public int bPassbackRecord; //0-涓嶅惎鐢ㄥ綍鍍忓洖浼,1鍚敤褰曞儚鍥炰紶 public byte byPreviewMode;//棰勮妯″紡锛0-姝ｅ父棰勮锛1-寤惰繜棰勮 @@ -3566,7 +3563,6 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public NET_DVR_STREAM_INFO struIDInfo; public NET_DVR_TIME struBeginTime; public NET_DVR_TIME struEndTime; - public HWND hWnd; public byte byDrawFrame; //0:涓嶆娊甯э紝1锛氭娊甯 public byte byVolumeType; //0-鏅氬綍鍍忓嵎 1-瀛樻。鍗 public byte byVolumeNum; //鍗峰彿锛岀洰鍓嶆寚瀛樻。鍗峰彿 @@ -6768,7 +6764,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public void invoke(int dwType, int lUserID, int lHandle, Pointer pUser); } public static interface FDrawFun extends StdCallCallback { - public void invoke(int lRealHandle,W32API.HDC hDc,int dwUser); + public void invoke(int lRealHandle,int dwUser); } public static interface FStdDataCallBack extends StdCallCallback { @@ -6922,9 +6918,6 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 int NET_DVR_FindFile_Card(int lUserID, int lChannel, int dwFileType, NET_DVR_TIME lpStartTime, NET_DVR_TIME lpStopTime); boolean NET_DVR_LockFileByName(int lUserID, String sLockFileName); boolean NET_DVR_UnlockFileByName(int lUserID, String sUnlockFileName); - int NET_DVR_PlayBackByName(int lUserID,String sPlayBackFileName, HWND hWnd); - int NET_DVR_PlayBackByTime(int lUserID,int lChannel, NET_DVR_TIME lpStartTime, NET_DVR_TIME lpStopTime, HWND hWnd); - int NET_DVR_PlayBackByTime_V40(int lUserID, NET_DVR_VOD_PARA pVodPara); boolean NET_DVR_PlayBackControl(int lPlayHandle,int dwControlCode,int dwInValue,IntByReference LPOutValue); boolean NET_DVR_PlayBackControl_V40(int lPlayHandle,int dwControlCode, Pointer lpInBuffer, int dwInLen, Pointer lpOutBuffer, IntByReference lpOutLen); boolean NET_DVR_StopPlayBack(int lPlayHandle); @@ -7273,37 +7266,10 @@ interface PlayCtrl extends StdCallLibrary boolean PlayM4_InputData(int nPort, ByteByReference pBuf, int nSize); boolean PlayM4_CloseStream(int nPort); boolean PlayM4_SetStreamOpenMode(int nPort, int nMode); - boolean PlayM4_Play(int nPort, HWND hWnd); boolean PlayM4_Stop(int nPort); boolean PlayM4_SetSecretKey(int nPort, int lKeyType, String pSecretKey, int lKeyLen); } //windows gdi鎺ュ彛,gdi32.dll in system32 folder, 鍦ㄨ缃伄鎸″尯鍩,绉诲姩渚︽祴鍖哄煙绛夋儏鍐典笅浣跨敤 -interface GDI32 extends W32API -{ - GDI32 INSTANCE = (GDI32) Native.loadLibrary("gdi32", GDI32.class, DEFAULT_OPTIONS); - - public static final int TRANSPARENT = 1; - int SetBkMode(HDC hdc, int i); - HANDLE CreateSolidBrush(int icolor); -} - -//windows user32鎺ュ彛,user32.dll in system32 folder, 鍦ㄨ缃伄鎸″尯鍩,绉诲姩渚︽祴鍖哄煙绛夋儏鍐典笅浣跨敤 -interface USER32 extends W32API -{ - - USER32 INSTANCE = (USER32) Native.loadLibrary("user32", USER32.class, DEFAULT_OPTIONS); - - public static final int BF_LEFT = 0x0001; - public static final int BF_TOP = 0x0002; - public static final int BF_RIGHT = 0x0004; - public static final int BF_BOTTOM = 0x0008; - public static final int BDR_SUNKENOUTER = 0x0002; - public static final int BF_RECT = (BF_LEFT | BF_TOP | BF_RIGHT | BF_BOTTOM); - - boolean DrawEdge(HDC hdc, RECT qrc, int edge, int grfFlags); - - int FillRect(HDC hDC, RECT lprc, HANDLE hbr); -} diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigService.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigService.java index fb54feb..9409d1c 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigService.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigService.java @@ -1,9 +1,10 @@ package cn.iocoder.yudao.module.camera.service.cameraioconfig; -import jakarta.validation.*; -import cn.iocoder.yudao.module.camera.controller.admin.cameraioconfig.vo.*; -import cn.iocoder.yudao.module.camera.dal.dataobject.cameraioconfig.CameraIoConfigDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.camera.dal.dataobject.cameraioconfig.CameraIoConfigDO; +import cn.iocoder.yudao.module.camera.vo.CameraIoConfigPageReqVO; +import cn.iocoder.yudao.module.camera.vo.CameraIoConfigSaveReqVO; +import jakarta.validation.Valid; /** * 棰勭疆鐐逛綅閰嶇疆 Service 鎺ュ彛 diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigServiceImpl.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigServiceImpl.java index 14a7e82..089e77a 100644 --- a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigServiceImpl.java +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/service/cameraioconfig/CameraIoConfigServiceImpl.java @@ -1,15 +1,14 @@ package cn.iocoder.yudao.module.camera.service.cameraioconfig; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import cn.iocoder.yudao.module.camera.controller.admin.cameraioconfig.vo.*; -import cn.iocoder.yudao.module.camera.dal.dataobject.cameraioconfig.CameraIoConfigDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.camera.dal.dataobject.cameraioconfig.CameraIoConfigDO; import cn.iocoder.yudao.module.camera.dal.mysql.cameraioconfig.CameraIoConfigMapper; +import cn.iocoder.yudao.module.camera.vo.CameraIoConfigPageReqVO; +import cn.iocoder.yudao.module.camera.vo.CameraIoConfigSaveReqVO; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.CAMERA_IO_CONFIG_NOT_EXISTS; diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigPageReqVO.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigPageReqVO.java new file mode 100644 index 0000000..3523d8a --- /dev/null +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigPageReqVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.camera.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "绠＄悊鍚庡彴 - 棰勭疆鐐逛綅閰嶇疆鍒嗛〉 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class CameraIoConfigPageReqVO extends PageParam { + + @Schema(description = "棰勭疆鐐逛綅code") + private String code; + + @Schema(description = "棰勭疆鐐逛綅鍚嶇О", example = "璧靛叚") + private String name; + +} \ No newline at end of file diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigRespVO.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigRespVO.java new file mode 100644 index 0000000..16ba6eb --- /dev/null +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigRespVO.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.camera.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "绠＄悊鍚庡彴 - 棰勭疆鐐逛綅閰嶇疆 Response VO") +@Data +@ExcelIgnoreUnannotated +public class CameraIoConfigRespVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6144") + @ExcelProperty("id") + private Integer id; + + @Schema(description = "棰勭疆鐐逛綅code") + @ExcelProperty("棰勭疆鐐逛綅code") + private String code; + + @Schema(description = "棰勭疆鐐逛綅鍚嶇О", example = "璧靛叚") + @ExcelProperty("棰勭疆鐐逛綅鍚嶇О") + private String name; + +} \ No newline at end of file diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigSaveReqVO.java b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigSaveReqVO.java new file mode 100644 index 0000000..4e5da05 --- /dev/null +++ b/yudao-module-camera/yudao-module-camera-biz/src/main/java/cn/iocoder/yudao/module/camera/vo/CameraIoConfigSaveReqVO.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.camera.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "绠＄悊鍚庡彴 - 棰勭疆鐐逛綅閰嶇疆鏂板/淇敼 Request VO") +@Data +public class CameraIoConfigSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6144") + private Integer id; + + @Schema(description = "棰勭疆鐐逛綅code") + private String code; + + @Schema(description = "棰勭疆鐐逛綅鍚嶇О", example = "璧靛叚") + private String name; + +} \ No newline at end of file diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/RXTXcomm.jar b/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/RXTXcomm.jar deleted file mode 100644 index e1e7503..0000000 Binary files a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/RXTXcomm.jar and /dev/null differ diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/connect-lib.jar b/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/connect-lib.jar deleted file mode 100644 index 19180d6..0000000 Binary files a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/connect-lib.jar and /dev/null differ diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/javaRFID-helloworld.jar b/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/javaRFID-helloworld.jar deleted file mode 100644 index 0e90d9f..0000000 Binary files a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/javaRFID-helloworld.jar and /dev/null differ diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/lib_reader.jar b/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/lib_reader.jar deleted file mode 100644 index cb23ff1..0000000 Binary files a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/lib_reader.jar and /dev/null differ diff --git a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/rxtx-2.1.7.jar b/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/rxtx-2.1.7.jar deleted file mode 100644 index 84e5f01..0000000 Binary files a/yudao-module-camera/yudao-module-camera-biz/src/main/resources/libs/rxtx-2.1.7.jar and /dev/null differ