From 59dd637267a99eadd2c5cf0b8d59e8dc4fbb6b26 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期六, 22 六月 2024 08:45:10 +0800
Subject: [PATCH] 增加：地形标定管理
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 205 +++++++++++++++++++++------------------------------
1 files changed, 85 insertions(+), 120 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index 15cd216..e703e1c 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -4,7 +4,10 @@
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.global.service.impl.QueueHandler;
import com.ruoyi.common.annotation.SdkOperate;
+import com.ruoyi.common.config.ARDConfig;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -105,76 +108,24 @@
log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触:" + getErrorCodePrint());
return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
- if (GlobalVariable.loginMap.containsKey(camera.getId())) {
- GlobalVariable.loginMap.remove(camera.getId());
- }
- //鍒犻櫎绠＄悊閫氶亾
- ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+// if (GlobalVariable.loginMap.containsKey(camera.getId())) {
+// GlobalVariable.loginMap.remove(camera.getId());
+// }
camera.setState("1");
camera.setChanNum(m_stDeviceInfo.byChanNum);
camera.setStartDChan(1);
camera.setLoginId((int) loginId.longValue());
- ardCamerasService.updateArdCameras(camera);
GlobalVariable.loginMap.put(camera.getId(), loginId);
-
//鑾峰彇鏈�鏂伴�氶亾
- for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
- ArdChannel channel = new ArdChannel();
- NetSDKLib.AV_CFG_ChannelName av_cfg_channelName = new NetSDKLib.AV_CFG_ChannelName();
- boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
- if (b) {
- String chanName = null;
- try {
- chanName = new String(av_cfg_channelName.szName, "GBK").trim();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- channel.setName(chanName);
- } else {
- channel.setName("閫氶亾" + i);
- }
- channel.setDeviceId(camera.getId());
- channel.setChanNo(i);
- ardChannelService.insertArdChannel(channel);
+ List<ArdChannel> ardChannelList = getChannels(camera);
+ if (ardChannelList.size() > 0) {
+ camera.setChanNum(ardChannelList.size());
+ ardCamerasService.updateArdCameras(camera);
+ //閰嶇疆鍒版祦濯掍綋
+ addVtdu(camera);
}
- //閰嶇疆鍒版祦濯掍綋
- for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
- String name = camera.getId() + "_" + i;
- String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + i + "&subtype=0";
- Vtdu vtdu = vtduService.selectVtduByName(name);
- if (vtdu != null) {
- vtduService.deleteVtduByName(name);
- }
- //娣诲姞鍒版祦濯掍綋
- CameraCmd cmd = new CameraCmd(camera.getId(), i);
- Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
- vtdu = new Vtdu();
- if (videoCompressionCfg.get("videoEncType") != null) {
- if (videoCompressionCfg.get("videoEncType").equals("鏍囧噯h264")) {
- vtdu.setIsCode("0");//榛樿涓嶈浆鐮�
- } else {
- vtdu.setIsCode("1");//榛樿杞爜
- }
- } else {
- vtdu.setIsCode("0");//榛樿涓嶈浆鐮�
- }
- vtdu.setRtspSource(rtspSource);
- vtdu.setName(camera.getId() + "_" + i);
- vtdu.setMode("1");//榛樿CPU杞В鐮�
- vtdu.setCameraId(camera.getId());
- vtduService.insertVtdu(vtdu);
- }
-
//鍒涘缓寮曞闃熷垪
- if (camera.getCamAlarmGuideEnable() != null && camera.getCamAlarmGuideEnable() == 1) {
- if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
- Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
- PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
- GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
- }
- //鍚姩闃熷垪澶勭悊鍣�
- queueHandler.process(camera.getId());
- }
+ createGuideQueue(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
log.error("璁惧鐧诲綍寮傚父:" + ex.getMessage());
@@ -199,11 +150,9 @@
log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触:" + getErrorCodePrint());
return AjaxResult.warn(getErrorCodePrint());
}
- if (GlobalVariable.loginMap.containsKey(camera.getId())) {
- GlobalVariable.loginMap.remove(camera.getId());
- }
- //鍒犻櫎绠＄悊閫氶亾
- ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+// if (GlobalVariable.loginMap.containsKey(camera.getId())) {
+// GlobalVariable.loginMap.remove(camera.getId());
+// }
camera.setState("1");
camera.setChanNum(m_stDeviceInfo.byChanNum);
camera.setStartDChan(1);
@@ -212,27 +161,13 @@
GlobalVariable.loginMap.put(camera.getId(), loginId);
//鑾峰彇鏈�鏂伴�氶亾
- for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
- ArdChannel channel = new ArdChannel();
- NetSDKLib.AV_CFG_ChannelName av_cfg_channelName = new NetSDKLib.AV_CFG_ChannelName();
- boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
- if (b) {
- String chanName = null;
- try {
- chanName = new String(av_cfg_channelName.szName, "GBK").trim();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- channel.setName(chanName);
- } else {
- channel.setName("閫氶亾" + i);
- }
- channel.setDeviceId(camera.getId());
- channel.setChanNo(i);
- ardChannelService.insertArdChannel(channel);
+ List<ArdChannel> ardChannelList = getChannels(camera);
+ if (ardChannelList.size() > 0) {
+ camera.setChanNum(ardChannelList.size());
+ ardCamerasService.updateArdCameras(camera);
+ //閰嶇疆鍒版祦濯掍綋
+ addVtdu(camera);
}
- //閰嶇疆鍒版祦濯掍綋
- addVtdu(camera);
//鍒涘缓寮曞闃熷垪
createGuideQueue(camera);
return AjaxResult.success("鐧诲綍鎴愬姛");
@@ -274,13 +209,49 @@
//鍒涘缓寮曞闃熷垪
private void createGuideQueue(ArdCameras camera) {
- if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
- Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
- PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
- GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
- //鍚姩闃熷垪澶勭悊鍣�
- queueHandler.process(camera.getId());
+ if (camera.getGdtype().equals("1")) {
+ if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
+ Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
+ PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
+ GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
+ //鍚姩闃熷垪澶勭悊鍣�
+ queueHandler.process(camera.getId());
+ }
}
+ }
+
+ //鑾峰彇閫氶亾
+ public List<ArdChannel> getChannels(ArdCameras camera) {
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ LLong loginId = new LLong(camera.getLoginId());
+ List<ArdChannel> ardChannelList = new ArrayList<>();
+ for (int i = 1; i < camera.getChanNum() + 1; i++) {
+ ArdChannel channel = new ArdChannel();
+ NetSDKLib.AV_CFG_ChannelName av_cfg_channelName = new NetSDKLib.AV_CFG_ChannelName();
+ boolean b = ConfigModule.GetNewDevConfig(loginId, i - 1, CFG_CMD_CHANNELTITLE, av_cfg_channelName);
+ if (!b) {
+ log.error("鑾峰彇閰嶇疆澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
+ // return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ }
+ String chanName = "";
+ try {
+ chanName = new String(av_cfg_channelName.szName, "GBK").trim();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ channel.setName(chanName.equals("") ? "閫氶亾" + i : chanName);
+ channel.setDeviceId(camera.getId());
+ channel.setChanNo(i);
+ if (camera.getGdtype().equals("2")) {
+ //NVR杩囨护涓嶅湪绾跨殑閫氶亾
+ if (!ConfigModule.queryCameraState(loginId, camera.getChanNum(), i)) {
+ continue;
+ }
+ }
+ ardChannelList.add(channel);
+ ardChannelService.insertArdChannel(channel);
+ }
+ return ardChannelList;
}
/**
@@ -559,7 +530,9 @@
return AjaxResult.warn("璁惧鏈櫥褰�");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
- String imagePath = FileUtils.createFile("D:/LocalCaptureTemp/" + cameraId + ".jpeg");
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String imagePath = FileUtils.createFile(tempPath + "/" + cameraId + ".jpeg");
fCaptureReceiveCB1 m_CaptureReceiveCB = new fCaptureReceiveCB1(imagePath);
CapturePictureModule.setSnapRevCallBack(m_CaptureReceiveCB);
boolean b = CapturePictureModule.remoteCapturePicture(loginId, chanNo - 1);
@@ -584,6 +557,7 @@
@Override
public AjaxResult localRecordStart(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
@@ -597,7 +571,10 @@
// GlobalVariable.previewMap.remove(cameraId);
// log.debug("鍋滄褰撳墠褰曞儚");
//}
- String path = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
+
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String path = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
LLong lRealHandle = RealPlayModule.startRealPlay(loginId, chanNo - 1, path);
if (lRealHandle.longValue() <= 0) {
log.error("鍙栨祦澶辫触" + getErrorCodePrint());
@@ -621,33 +598,19 @@
@Override
public AjaxResult localRecordStop(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
LLong lRealHandle = new LLong(cmd.getRecordId());
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return AjaxResult.warn("璁惧鏈櫥褰�");
}
-
RealPlayModule.stopRealPlay(lRealHandle);
log.debug("鏈湴褰曞儚鍋滄");
- String recordPath = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String recordPath = FileUtils.createFile(tempPath + "/" + operator + "/" + cameraId + ".mp4");
byte[] imageBytes = Files.readAllBytes(Paths.get(recordPath));
- // OutputStream outputStream = response.getOutputStream();
- // outputStream.write(imageBytes);
return AjaxResult.success(imageBytes);
- //if (GlobalVariable.previewMap.containsKey(cameraId)) {
- // lRealHandle = new LLong(GlobalVariable.previewMap.get(cameraId));
- // RealPlayModule.stopRealPlay(lRealHandle);
- // GlobalVariable.previewMap.remove(cameraId);
- // log.debug("鏈湴褰曞儚鍋滄");
- // String recordPath = FileUtils.createFile("D:/LocalRecordTemp/" + cameraId + ".mp4");
- // byte[] imageBytes = Files.readAllBytes(Paths.get(recordPath));
- // // OutputStream outputStream = response.getOutputStream();
- // // outputStream.write(imageBytes);
- // return AjaxResult.success(imageBytes);
- //}
- //else {
- // return AjaxResult.error("璁惧鏈紑濮嬪綍鍍�");
- //}
} catch (Exception ex) {
log.error("鏈湴褰曞儚鍋滄寮傚父" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚鍋滄寮傚父" + ex.getMessage());
@@ -668,7 +631,9 @@
String url = "";
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
- String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
@@ -707,7 +672,9 @@
try {
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
- String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
}
@@ -743,7 +710,9 @@
String url = "";
try {
String cameraId = cmd.getCameraId();
- String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ String tempPath = ARDConfig.getProfile() + Constants.LOCAL_RECORD_TEMP_PREFIX;
+ String path = FileUtils.createFile(tempPath + "/" + cameraId + ".mp4");
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
}
@@ -793,10 +762,6 @@
return result;
}
- @Override
- public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
- return null;
- }
/**
* 寮曞鐩爣浣嶇疆
--
Gitblit v1.9.3