From a67ffb9aa4c1b45391c082eaaaf48657ff21a13b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 31 五月 2023 10:44:08 +0800
Subject: [PATCH] 提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java | 2
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 126 +++++++++++++++++++++---------------------
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java | 2
3 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
index 171e5db..58a292a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
@@ -87,7 +87,7 @@
//鎵嬪姩褰曞儚
String record(CameraCmd cmd);
//鎵嬪姩褰曞儚
- void recordToMinio(CameraCmd cmd) throws IOException;
+ void recordToMinio(CameraCmd cmd);
//寮曞鐩爣浣嶇疆
boolean setTargetPosition(CameraCmd cmd);
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index 9323a51..01b5d5c 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -1297,78 +1297,78 @@
@Override
@SdkOperate
- public void recordToMinio(CameraCmd cmd) throws IOException {
- String cameraId = cmd.getCameraId();
- Integer channelNum = cmd.getChannelNum();
- boolean enable = cmd.isEnable();
- if (!globalVariable.loginMap.containsKey(cameraId)) {
- return;
- }
- Integer userId = globalVariable.loginMap.get(cameraId);
- String path = "";
- //棰勮鍙傛暟
- NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
- previewinfo.read();
- previewinfo.lChannel = channelNum;
- previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
- previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
- previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
- previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
- previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
- previewinfo.write();
- int lRealHandle;
- if (enable) {
- if (!user_real_Map.containsKey(userId)) {
- lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
- if (lRealHandle == -1) {
- int iErr = hCNetSDK.NET_DVR_GetLastError();
- log.error("鍙栨祦澶辫触" + iErr);
+ public void recordToMinio(CameraCmd cmd) {
+ try {
+ String cameraId = cmd.getCameraId();
+ Integer channelNum = cmd.getChannelNum();
+ boolean enable = cmd.isEnable();
+ if (!globalVariable.loginMap.containsKey(cameraId)) {
+ return;
+ }
+ Integer userId = globalVariable.loginMap.get(cameraId);
+ String path = "";
+ //棰勮鍙傛暟
+ NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
+ previewinfo.read();
+ previewinfo.lChannel = channelNum;
+ previewinfo.dwStreamType = 0;//鐮佹祦绫诲瀷锛�0-涓荤爜娴侊紝1-瀛愮爜娴侊紝2-涓夌爜娴侊紝3-铏氭嫙鐮佹祦锛屼互姝ょ被鎺�
+ previewinfo.dwLinkMode = 0;//杩炴帴鏂瑰紡锛�0-TCP鏂瑰紡锛�1-UDP鏂瑰紡锛�2-澶氭挱鏂瑰紡锛�3-RTP鏂瑰紡锛�4-RTP/RTSP锛�5-RTP/HTTP锛�6-HRUDP锛堝彲闈犱紶杈擄級锛�7-RTSP/HTTPS锛�8-NPQ
+ previewinfo.hPlayWnd = null;//鎾斁绐楀彛鐨勫彞鏌勶紝涓篘ULL琛ㄧず涓嶈В鐮佹樉绀恒��
+ previewinfo.bBlocked = 0;//0- 闈為樆濉炲彇娴侊紝1-闃诲鍙栨祦
+ previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
+ previewinfo.write();
+ int lRealHandle;
+ if (enable) {
+ if (!user_real_Map.containsKey(userId)) {
+ lRealHandle = hCNetSDK.NET_DVR_RealPlay_V40(userId, previewinfo, null, null);
+ if (lRealHandle == -1) {
+ int iErr = hCNetSDK.NET_DVR_GetLastError();
+ log.error("鍙栨祦澶辫触" + iErr);
+ return;
+ }
+ log.info("鍙栨祦鎴愬姛");
+ File file = new File("D:/recordTemp/" + cameraId + ".mp4");
+ if (!file.exists()) {
+ File fileParent = file.getParentFile();
+ if (!fileParent.exists()) {
+ fileParent.mkdirs();
+ }
+ file.createNewFile();
+ }
+ path = file.getCanonicalPath();
+ recordInfo info = new recordInfo();
+ info.setLRealHandle(lRealHandle);
+ info.setRecordPath(path);
+ user_real_Map.put(userId, info);
+ }
+ recordInfo info = user_real_Map.get(userId);
+ if (!hCNetSDK.NET_DVR_SaveRealData_V30(info.getLRealHandle(), 1, info.getRecordPath())) {
+ log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
return;
}
- log.info("鍙栨祦鎴愬姛");
- File file = new File("D:/recordTemp/" + cameraId + ".mp4");
- if (!file.exists()) {
- File fileParent = file.getParentFile();
- if (!fileParent.exists()) {
- fileParent.mkdirs();
- }
- file.createNewFile();
+ log.info("褰曞儚寮�濮�");
+ } else {
+ recordInfo info = user_real_Map.get(userId);
+ if (StringUtils.isNull(info)) {
+ return;
}
- path = file.getCanonicalPath();
- recordInfo info = new recordInfo();
- info.setLRealHandle(lRealHandle);
- info.setRecordPath(path);
- user_real_Map.put(userId, info);
- }
- recordInfo info = user_real_Map.get(userId);
- if (!hCNetSDK.NET_DVR_SaveRealData_V30(info.getLRealHandle(), 1, info.getRecordPath())) {
- log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
- return;
- }
- log.info("褰曞儚寮�濮�");
- } else {
- recordInfo info = user_real_Map.get(userId);
- if (StringUtils.isNull(info)) {
- return;
- }
- hCNetSDK.NET_DVR_StopRealPlay(info.getLRealHandle());
- log.info("褰曞儚鍋滄");
- //瀛樺叆minio
- String BucketName = cmd.getRecordBucketName();
- String ObjectName = cmd.getRecordObjectName();
- String ContentType = "video/MP4";
- FileInputStream stream = new FileInputStream(info.getRecordPath());
- String url = "";
- try {
+ hCNetSDK.NET_DVR_StopRealPlay(info.getLRealHandle());
+ log.info("褰曞儚鍋滄");
+ //瀛樺叆minio
+ String BucketName = cmd.getRecordBucketName();
+ String ObjectName = cmd.getRecordObjectName();
+ String ContentType = "video/MP4";
+ FileInputStream stream = new FileInputStream(info.getRecordPath());
+ String url = "";
boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
if (b) {
url = BucketName + ObjectName;
log.info("涓婁紶鏂囦欢鎴愬姛!" + url);
+ user_real_Map.remove(userId);
}
- } catch (IOException ex) {
- log.error("涓婁紶鏂囦欢寮傚父锛�" + ex.getMessage());
}
- user_real_Map.remove(userId);
+ } catch (Exception ex) {
+ log.error("褰曞儚寮傚父" + ex.getMessage());
}
}
}
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
index fb9b1c0..ec09940 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java
@@ -43,7 +43,7 @@
@Resource
IHikClientService hikClientService;
- public void scanRun() throws IOException {
+ public void scanRun(){
/*鎵弿鎵�鏈夊彲鎵ц浠诲姟1-鏃堕棿婊¤冻2-鑷姩*/
log.info("寮�濮嬫壂鎻忔墍鏈夊彲鎵ц浠诲姟");
ArdVideoInspectTask ardVideoInspectTask = new ArdVideoInspectTask();
--
Gitblit v1.9.3