From 9b8bb10acf41929d9fa2750fa069302ad317c8cf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 14:40:26 +0800
Subject: [PATCH] 电磁锁车辆查询修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 193 +++++++++++++++++++++++------------------------
1 files changed, 95 insertions(+), 98 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index 3b0c5ce..ed90621 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -4,6 +4,8 @@
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.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
@@ -13,8 +15,11 @@
import com.ruoyi.device.camera.factory.CameraSDK;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.service.IArdChannelService;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+import com.ruoyi.device.terrain.service.IArdTerrainMarkService;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.utils.gis.GisUtil;
@@ -41,6 +46,7 @@
import java.text.DecimalFormat;
import java.util.*;
import java.util.concurrent.PriorityBlockingQueue;
+import java.util.stream.Collectors;
import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.*;
import static com.ruoyi.utils.sdk.hiksdk.lib.HCNetSDK.NET_DVR_GET_GISINFO;
@@ -62,7 +68,8 @@
private IVtduService vtduService;
@Resource
private QueueHandler queueHandler;
-
+ @Resource
+ ICameraSdkService cameraSdkService;
public Object _lock = new Object();
public static HCNetSDK hCNetSDK = HCNetSDK.hCNetSDK;
private static HCNetSDK.FExceptionCallBack fExceptionCallBack;//寮傚父鍥炶皟
@@ -87,7 +94,7 @@
String WIN_PATH = System.getProperty("user.dir") + File.separator + "ardLog" + File.separator + "logs" + File.separator;
hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, true);
} else {
- hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", true);
+ hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog" , true);
}
String m_sDeviceIP = camera.getIp();
String m_sUsername = camera.getUsername();
@@ -138,15 +145,11 @@
}
}
- 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());
+// }
GlobalVariable.loginMap.put(camera.getId(), lUserID);
GlobalVariable.loginCameraMap.put(lUserID, camera);
-
camera.setLoginId(lUserID);
camera.setState("1");
int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
@@ -158,26 +161,19 @@
camera.setChanNum(chanNum);
camera.setStartDChan(startDchan);
//鑾峰彇鏈�鏂伴�氶亾
- List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
+ List<ArdChannel> cameraChannelList = getChannels(camera);
if (cameraChannelList.size() > 0) {
camera.setChannelList(cameraChannelList);
- for (ArdChannel channel : cameraChannelList) {
- channel.setId(IdUtils.simpleUUID());
- ardChannelService.insertArdChannel(channel);
- }
+ camera.setChanNum(cameraChannelList.size());
+ ardCamerasService.updateArdCameras(camera);
//娣诲姞鍒版祦濯掍綋
addVtdu(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);
- }
- ardCamerasService.updateArdCameras(camera);
+ createGuideQueue(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("璁惧鐧诲綍寮傚父", ex);
+ log.error("璁惧鐧诲綍寮傚父" , ex);
return AjaxResult.error("璁惧鐧诲綍寮傚父" + ex.getMessage());
}
}
@@ -204,7 +200,7 @@
String WIN_PATH = System.getProperty("user.dir") + File.separator + "ardLog" + File.separator + "logs" + File.separator;
hCNetSDK.NET_DVR_SetLogToFile(3, WIN_PATH, true);
} else {
- hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog", true);
+ hCNetSDK.NET_DVR_SetLogToFile(3, "/home/ardLog/hiklog" , true);
}
String m_sDeviceIP = camera.getIp();
String m_sUsername = camera.getUsername();
@@ -255,15 +251,11 @@
}
}
}
- 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());
+// }
GlobalVariable.loginMap.put(camera.getId(), lUserID);
GlobalVariable.loginCameraMap.put(lUserID, camera);
-
camera.setLoginId(lUserID);
camera.setState("1");
int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
@@ -274,37 +266,34 @@
}
camera.setChanNum(chanNum);
camera.setStartDChan(startDchan);
-
//鑾峰彇鏈�鏂伴�氶亾
- List<ArdChannel> cameraChannelList = getIPChannelInfo(camera);
+ List<ArdChannel> cameraChannelList = getChannels(camera);
if (cameraChannelList.size() > 0) {
camera.setChannelList(cameraChannelList);
camera.setChanNum(cameraChannelList.size());
- for (ArdChannel channel : cameraChannelList) {
- channel.setId(IdUtils.simpleUUID());
- ardChannelService.insertArdChannel(channel);
- }
+ ardCamerasService.updateArdCameras(camera);
+ //娣诲姞鍒版祦濯掍綋
+ addVtdu(camera);
}
- ardCamerasService.updateArdCameras(camera);
- //娣诲姞鍒版祦濯掍綋
- addVtdu(camera);
//鍒涘缓寮曞闃熷垪
createGuideQueue(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("娉ㄥ唽璁惧寮傚父", ex);
+ log.error("娉ㄥ唽璁惧寮傚父" , ex);
return AjaxResult.error("娉ㄥ唽璁惧寮傚父" + ex.getMessage());
}
}
//鍒涘缓寮曞闃熷垪
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());
+ }
}
}
@@ -884,10 +873,10 @@
nFrameRate = "鏈煡";
break;
}
- map.put("resolution", resolution);//鍒嗚鲸鐜�
- map.put("videoBitrate", videoBitrate);//姣旂壒鐜�
- map.put("videoEncType", videoEncType);//缂栫爜
- map.put("nFrameRate", nFrameRate);//甯х巼
+ map.put("resolution" , resolution);//鍒嗚鲸鐜�
+ map.put("videoBitrate" , videoBitrate);//姣旂壒鐜�
+ map.put("videoEncType" , videoEncType);//缂栫爜
+ map.put("nFrameRate" , nFrameRate);//甯х巼
} else {
int code = hCNetSDK.NET_DVR_GetLastError();
@@ -940,9 +929,9 @@
double z = d.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
//log.debug("T鍨傜洿鍙傛暟涓�: " + p + "P姘村钩鍙傛暟涓�: " + t + "Z鍙樺�嶅弬鏁颁负: " + z);
Map<String, Object> ptzMap = new HashMap<>();
- ptzMap.put("p", p);
- ptzMap.put("t", t);
- ptzMap.put("z", z);
+ ptzMap.put("p" , p);
+ ptzMap.put("t" , t);
+ ptzMap.put("z" , z);
return AjaxResult.success(ptzMap);
}
@@ -989,9 +978,9 @@
float fTilt = lpPTZAbsoluteEX_cfg.struPTZCtrl.fTilt;
float t = fTilt < 0 ? fTilt + 360 : fTilt;
float z = lpPTZAbsoluteEX_cfg.struPTZCtrl.fZoom;
- ptzMap.put("p", p);
- ptzMap.put("t", t);
- ptzMap.put("z", z);
+ ptzMap.put("p" , p);
+ ptzMap.put("t" , t);
+ ptzMap.put("z" , z);
return AjaxResult.success(ptzMap);
} catch (Exception ex) {
log.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆寮傚父:" + ex.getMessage());
@@ -1096,7 +1085,7 @@
return AjaxResult.success("璁剧疆楂樼簿搴TZ鍙傛暟鎴愬姛");
} catch (Exception ex) {
- log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父", ex);
+ log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父" , ex);
return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父:" + ex);
}
}
@@ -1118,7 +1107,10 @@
double[] targetPositions = cmd.getTargetPosition();
double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
String p = String.valueOf((int) (cameraPTZ[0] * 10));
- String t = String.valueOf((int) (cameraPTZ[1] * 10));
+ //淇淇话
+ double correctPitch = cameraSdkService.correctPitch(cmd);
+ double newt = cameraPTZ[1] + correctPitch;
+ String t = String.valueOf((int) (newt * 10));
String z = String.valueOf((int) (cameraPTZ[2] * 10));
m_ptzPosCurrent.wPanPos = (short) (Integer.parseInt(p, 16));
m_ptzPosCurrent.wTiltPos = (short) (Integer.parseInt(t, 16));
@@ -1131,7 +1123,7 @@
log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
return AjaxResult.warn("璁剧疆ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
- return AjaxResult.success("寮曞鍧愭爣鎴愬姛");
+ return AjaxResult.success("寮曞鍧愭爣鎴愬姛",correctPitch);
} catch (Exception ex) {
log.error("寮曞鍧愭爣寮傚父:" + ex.getMessage());
return AjaxResult.error("寮曞鍧愭爣寮傚父:" + ex.getMessage());
@@ -1240,12 +1232,12 @@
String wZoomPosMax = df.format((float) Integer.parseInt(Integer.toHexString(m_ptzPosCurrent.wZoomPosMax)) / 10);
String wZoomPosMin = df.format((float) Integer.parseInt(Integer.toHexString(m_ptzPosCurrent.wZoomPosMin)) / 10);
Map<String, Object> ptzScopeMap = new HashMap<>();
- ptzScopeMap.put("pMax", wPanPosMax);
- ptzScopeMap.put("pMin", wPanPosMin);
- ptzScopeMap.put("tMax", wTiltPosMax);
- ptzScopeMap.put("tMin", wTiltPosMin);
- ptzScopeMap.put("zMax", wZoomPosMax);
- ptzScopeMap.put("zMin", wZoomPosMin);
+ ptzScopeMap.put("pMax" , wPanPosMax);
+ ptzScopeMap.put("pMin" , wPanPosMin);
+ ptzScopeMap.put("tMax" , wTiltPosMax);
+ ptzScopeMap.put("tMin" , wTiltPosMin);
+ ptzScopeMap.put("zMax" , wZoomPosMax);
+ ptzScopeMap.put("zMin" , wZoomPosMin);
return AjaxResult.success(ptzScopeMap);
}
}
@@ -1261,7 +1253,7 @@
@Override
public AjaxResult controlDefogcfg(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
- Integer chanNo=cmd.getChanNo();
+ Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return AjaxResult.warn("璁惧鏈櫥褰�");
@@ -1341,7 +1333,7 @@
boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG, chanNo, point, struDayNigh.size());
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鍒囨崲绾㈠澶辫触 ErrorCode:{},ErrorInfo:{}", code, SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鍒囨崲绾㈠澶辫触 ErrorCode:{},ErrorInfo:{}" , code, SdkErrorCodeEnum.getDescByCode(code));
return AjaxResult.warn("鍒囨崲绾㈠澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鍒囨崲绾㈠鎴愬姛");
@@ -1623,7 +1615,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");
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return "";
@@ -1695,7 +1689,9 @@
try {
String cameraId = cmd.getCameraId();
Integer channelNum = 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;
}
@@ -1753,7 +1749,9 @@
try {
String cameraId = cmd.getCameraId();
Integer channelNum = 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 "";
}
@@ -1847,10 +1845,12 @@
}
//鑾峰彇IP閫氶亾
- public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
+ public List<ArdChannel> getChannels(ArdCameras camera) {
//鑾峰彇閫氶亾
List<ArdChannel> channelList = new ArrayList<>();
try {
+ //鍒犻櫎绠＄悊閫氶亾
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
IntByReference ibrBytesReturned = new IntByReference(0);//鑾峰彇IP鎺ュ叆閰嶇疆鍙傛暟
HCNetSDK.NET_DVR_IPPARACFG_V40 m_strIpparaCfg = new HCNetSDK.NET_DVR_IPPARACFG_V40();
m_strIpparaCfg.write();
@@ -1860,7 +1860,7 @@
m_strIpparaCfg.read();
//log.debug("璧峰鏁板瓧閫氶亾鍙凤細" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
- ArdChannel ardChannel = new ArdChannel();
+ ArdChannel channel = new ArdChannel();
int chanNo = iChannum + camera.getStartDChan();
HCNetSDK.NET_DVR_PICCFG_V40 strPicCfg = new HCNetSDK.NET_DVR_PICCFG_V40();
strPicCfg.dwSize = strPicCfg.size();
@@ -1868,8 +1868,7 @@
Pointer pStrPicCfg = strPicCfg.getPointer();
NativeLong lChannel = new NativeLong(chanNo);
IntByReference pInt = new IntByReference(0);
- boolean b_GetPicCfg = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(),
- pStrPicCfg, strPicCfg.size(), pInt);
+ boolean b_GetPicCfg = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(), pStrPicCfg, strPicCfg.size(), pInt);
if (!b_GetPicCfg) {
// log.error("鑾峰彇鍥惧儚鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
}
@@ -1878,22 +1877,21 @@
if (m_strIpparaCfg.struStreamMode[iChannum].byGetStreamType == 0) {
m_strIpparaCfg.struStreamMode[iChannum].uGetStream.setType(HCNetSDK.NET_DVR_IPCHANINFO.class);
m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.read();
- int channel = m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPID + m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPIDHigh * 256;
+ int channelNo = m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPID + m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byIPIDHigh * 256;
String channelName = new String(strPicCfg.sChanName, "GBK").trim();
channelName = channelName.equals("") ? "閫氶亾" + chanNo : channelName;
- ardChannel.setDeviceId(camera.getId());
- ardChannel.setName(channelName);
- ardChannel.setChanNo(chanNo);
+ channel.setDeviceId(camera.getId());
+ channel.setName(channelName);
+ channel.setChanNo(chanNo);
if (camera.getGdtype().equals("3") || camera.getGdtype().equals("2")) {
- //NVR鍙幏鍙栧湪绾块�氶亾
- if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable == 1) {
- //log.debug("IP閫氶亾" + channum + "鍦ㄧ嚎");
- channelList.add(ardChannel);
+ //NVR杩囨护绂荤嚎閫氶亾
+ if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable != 1) {
+ continue;
}
- } else {
- channelList.add(ardChannel);
}
+ channelList.add(channel);
}
+ ardChannelService.insertArdChannel(channel);
}
} catch (Exception ex) {
log.error("鑾峰彇IP閫氶亾寮傚父:" + ex.getMessage());
@@ -1935,11 +1933,11 @@
}
struGisInfo.read();
Map<String, Object> map = new HashMap<>();
- map.put("p", struGisInfo.struPtzPos.fPanPos);
- map.put("t", struGisInfo.struPtzPos.fTiltPos < 0 ? struGisInfo.struPtzPos.fTiltPos + 360 : struGisInfo.struPtzPos.fTiltPos);
- map.put("z", struGisInfo.struPtzPos.fZoomPos);
- map.put("fHorFieldAngle", struGisInfo.fHorizontalValue);// 姘村钩瑙嗗満瑙�
- map.put("fVerFieldAngle", struGisInfo.fVerticalValue);// 鍨傜洿瑙嗗満瑙�
+ map.put("p" , struGisInfo.struPtzPos.fPanPos);
+ map.put("t" , struGisInfo.struPtzPos.fTiltPos < 0 ? struGisInfo.struPtzPos.fTiltPos + 360 : struGisInfo.struPtzPos.fTiltPos);
+ map.put("z" , struGisInfo.struPtzPos.fZoomPos);
+ map.put("fHorFieldAngle" , struGisInfo.fHorizontalValue);// 姘村钩瑙嗗満瑙�
+ map.put("fVerFieldAngle" , struGisInfo.fVerticalValue);// 鍨傜洿瑙嗗満瑙�
return AjaxResult.success(map);
}
@@ -1948,9 +1946,12 @@
@Override
public AjaxResult localRecordStart(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
- 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");
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return AjaxResult.warn("璁惧鏈櫥褰�");
}
@@ -1996,7 +1997,7 @@
return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鏈湴褰曞儚寮�濮�");
- return AjaxResult.success("褰曞儚寮�濮�", lRealHandle);
+ return AjaxResult.success("褰曞儚寮�濮�" , lRealHandle);
} catch (Exception ex) {
log.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
@@ -2007,6 +2008,7 @@
@Override
public AjaxResult localRecordStop(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
Integer lRealHandle = cmd.getRecordId().intValue();
@@ -2037,17 +2039,12 @@
previewinfo.byNPQMode = 0;//NPQ妯″紡锛�0-鐩磋繛妯″紡锛�1-杩囨祦濯掍綋妯″紡
previewinfo.write();
//endregion
- //if (GlobalVariable.previewMap.containsKey(cameraId)) {
- // Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
- // hCNetSDK.NET_DVR_StopRealPlay(lRealHandle);
- // GlobalVariable.previewMap.remove(cameraId);
- //}
hCNetSDK.NET_DVR_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[] recordBytes = Files.readAllBytes(Paths.get(recordPath));
- //OutputStream outputStream = response.getOutputStream();
- //outputStream.write(imageBytes);
return AjaxResult.success(recordBytes);
} catch (Exception ex) {
log.error("鏈湴褰曞儚鍋滄寮傚父" + ex.getMessage());
--
Gitblit v1.9.3