From 56b6e1d795e9a4badee9229d8a6ccd6e0d56d4c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 04 七月 2024 10:22:25 +0800
Subject: [PATCH] 电磁锁电子围栏概要提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 359 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 183 insertions(+), 176 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 77f2a33..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;//寮傚父鍥炶皟
@@ -80,14 +87,14 @@
try {
// 鍒濆鍖�
if (!hCNetSDK.NET_DVR_Init()) {
- log.error("SDK鍒濆鍖栧け璐�");
+ log.debug("SDK鍒濆鍖栧け璐�");
}
//鎵撳嵃娴峰悍sdk鏃ュ織
if (Platform.isWindows()) {
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();
@@ -123,8 +130,8 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
ardCamerasService.updateArdCameras(camera);
- log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ log.debug("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+ return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");
@@ -138,40 +145,35 @@
}
}
- 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");
- camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
- camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
+ int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+ int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+ if (camera.getGdtype().equals("2")) {
+ chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+ startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
+ }
+ 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());
}
}
@@ -191,14 +193,14 @@
// 鍒濆鍖�
if (!hCNetSDK.NET_DVR_Init()) {
log.error("SDK鍒濆鍖栧け璐�");
- return AjaxResult.error("SDK鍒濆鍖栧け璐�");
+ return AjaxResult.warn("SDK鍒濆鍖栧け璐�");
}
//鎵撳嵃娴峰悍sdk鏃ュ織
if (Platform.isWindows()) {
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();
@@ -234,8 +236,8 @@
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
ardCamerasService.updateArdCameras(camera);
- log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
+ return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.debug("Login Success 銆� " + camera.getIp() + ":" + camera.getPort() + " 銆�");
synchronized (_lock) {
@@ -249,50 +251,49 @@
}
}
}
- 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");
- camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
- camera.setStartDChan((int) m_strDeviceInfo.struDeviceV30.byStartDChan);
-
+ int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
+ int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
+ if (camera.getGdtype().equals("2")) {
+ chanNum = m_strDeviceInfo.struDeviceV30.byIPChanNum;
+ startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
+ }
+ 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());
+ }
}
}
@@ -387,7 +388,7 @@
Integer speed = cmd.getSpeed();
Integer code = cmd.getCode();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -456,7 +457,7 @@
if (!bool) {
int errorCode = hCNetSDK.NET_DVR_GetLastError();
log.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("鎺у埗澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ return AjaxResult.warn("鎺у埗澶辫触:" + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
return AjaxResult.success("鎺у埗鎴愬姛");
}
@@ -472,7 +473,7 @@
Integer channelNum = cmd.getChanNo();
Integer dwFocusPos = cmd.getDwFocusPos();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
// 鑾峰彇鍙傛暟
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -490,7 +491,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触,璇风◢鍚庨噸璇�" + code);
- return AjaxResult.error("璁剧疆GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆GIS淇℃伅鏁版嵁鎴愬姛");
}
@@ -522,7 +523,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鑱氱劍鍊煎け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鑱氱劍鍊煎け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struGisInfo.read();
int result = struGisInfo.struPtzPosEx.dwFocus;
@@ -547,7 +548,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("棰勭疆鐐硅缃け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("棰勭疆鐐硅缃け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("棰勭疆鐐硅缃垚鍔�");
}
@@ -570,7 +571,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璋冪敤棰勭疆鐐瑰け璐�: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璋冪敤棰勭疆鐐瑰け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璋冪敤棰勭疆鐐规垚鍔�");
}
@@ -872,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();
@@ -899,7 +900,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -911,7 +912,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
m_ptzPosCurrent.read();
// DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -928,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);
}
@@ -949,7 +950,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
IntByReference pchannel = new IntByReference(chanNo);
Pointer pChannelNum = pchannel.getPointer();
@@ -966,8 +967,8 @@
boolean res = hCNetSDK.NET_DVR_GetSTDConfig(lUserID, HCNetSDK.NET_DVR_GET_PTZABSOLUTEEX, lpConfigParam6696);
if (!res) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇楂樼簿搴TZ缁濆浣嶇疆閰嶇疆澶辫触: errorCde" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇楂樼簿搴TZ澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
lpPTZAbsoluteEX_cfg.read();
//log.debug("P锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fPan + " T锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fTilt + " Z锛�" + lpPTZAbsoluteEX_cfg.struPTZCtrl.fZoom
@@ -977,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());
@@ -1002,7 +1003,7 @@
Integer channelNum = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1018,9 +1019,9 @@
m_ptzPosCurrent.write();
boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size());
if (!bool) {
- int errorCode = hCNetSDK.NET_DVR_GetLastError();
- log.error("璁剧疆PTZ鍙傛暟澶辫触:" + errorCode);
- return AjaxResult.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆PTZ鍙傛暟澶辫触: errorCode" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆PTZ鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆PTZ鍙傛暟鎴愬姛");
} catch (Exception ex) {
@@ -1045,7 +1046,7 @@
Integer chanNo = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer lUserID = (Integer) GlobalVariable.loginMap.get(cameraId);
IntByReference pchannel = new IntByReference(chanNo);
@@ -1077,14 +1078,14 @@
lpConfigParam6697.write();
boolean bool = hCNetSDK.NET_DVR_SetSTDConfig(lUserID, NET_DVR_SET_PTZABSOLUTEEX, lpConfigParam6697);
if (!bool) {
- int errorCode = hCNetSDK.NET_DVR_GetLastError();
- log.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触:" + errorCode);
- return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆楂樼簿搴TZ澶辫触:" + code);
+ return AjaxResult.warn("璁剧疆楂樼簿搴TZ澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success("璁剧疆楂樼簿搴TZ鍙傛暟鎴愬姛");
} catch (Exception ex) {
- log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父", ex);
+ log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父" , ex);
return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父:" + ex);
}
}
@@ -1095,7 +1096,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZPOS m_ptzPosCurrent = new NET_DVR_PTZPOS();
@@ -1106,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));
@@ -1117,9 +1121,9 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆ptz澶辫触,璇风◢鍚庨噸璇�" + code);
- return AjaxResult.error("璁剧疆ptz澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(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());
@@ -1139,7 +1143,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_PTZ_LOCKCFG netDvrPtzLockcfg = new NET_DVR_PTZ_LOCKCFG();
@@ -1149,8 +1153,8 @@
boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZLOCKCFG, channelNum, point, netDvrPtzLockcfg.size(), ibrBytesReturned);
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz閿佸畾淇℃伅澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇ptz閿佸畾澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz閿佸畾澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
} else {
netDvrPtzLockcfg.read();
int byWorkMode = netDvrPtzLockcfg.byWorkMode;
@@ -1187,7 +1191,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆闆舵柟浣嶈澶辫触:" + code);
- return AjaxResult.error("璁剧疆闆舵柟浣嶈澶辫触: errorCode:" + code + "errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆闆舵柟浣嶈澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
return AjaxResult.success();
}
@@ -1216,7 +1220,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇ptz鑼冨洿澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇ptz鑼冨洿澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
} else {
m_ptzPosCurrent.read();
DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
@@ -1228,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);
}
}
@@ -1249,20 +1253,20 @@
@Override
public AjaxResult controlDefogcfg(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
+ Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
- Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struCameraParam = new NET_DVR_CAMERAPARAMCFG_EX();
Pointer point = struCameraParam.getPointer();
IntByReference ibrBytesReturned = new IntByReference(0);
- boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size(), ibrBytesReturned);
+ boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size(), ibrBytesReturned);
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struCameraParam.read();
log.debug("鏄惁寮�鍚�忛浘锛�" + struCameraParam.struDefogCfg.byMode);
@@ -1276,11 +1280,11 @@
}
struCameraParam.struDefogCfg = defogcfg;
struCameraParam.write();
- boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size());
+ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, chanNo, point, struCameraParam.size());
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鍒囨崲閫忛浘澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鍒囨崲閫忛浘澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鍒囨崲閫忛浘澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鍒囨崲閫忛浘鎴愬姛");
return AjaxResult.success("鍒囨崲閫忛浘鎴愬姛");
@@ -1300,7 +1304,7 @@
boolean enable = cmd.isEnable();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();
@@ -1310,7 +1314,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struDayNigh.read();
String current = struDayNigh.struDayNight.byDayNightFilterType == 1 ? "寮�鍚�" : "鍏抽棴";
@@ -1329,8 +1333,8 @@
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));
- return AjaxResult.error("鍒囨崲绾㈠澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鍒囨崲绾㈠澶辫触 ErrorCode:{},ErrorInfo:{}" , code, SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鍒囨崲绾㈠澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鍒囨崲绾㈠鎴愬姛");
return AjaxResult.success("鍒囨崲绾㈠鎴愬姛");
@@ -1350,7 +1354,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1360,7 +1364,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struFocusMode.read();
log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1378,7 +1382,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆鑱氱劍妯″紡鎴愬姛");
return AjaxResult.success("璁剧疆鑱氱劍妯″紡鎴愬姛");
@@ -1396,7 +1400,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
@@ -1405,8 +1409,8 @@
boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ log.error("鑾峰彇鑱氱劍妯″紡澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鑱氱劍妯″紡澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struFocusMode.read();
log.debug("褰撳墠鑱氱劍妯″紡锛�" + struFocusMode.byFocusMode);
@@ -1427,7 +1431,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -1440,7 +1444,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆浜戝彴鍔犵儹澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆浜戝彴鍔犵儹澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆浜戝彴鍔犵儹鎴愬姛");
return AjaxResult.success("璁剧疆浜戝彴鍔犵儹鎴愬姛");
@@ -1460,7 +1464,7 @@
boolean enable = cmd.isEnable();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_DEVSERVER_CFG struDeicing = new NET_DVR_DEVSERVER_CFG();
@@ -1470,7 +1474,7 @@
if (!b_GetCameraParam) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇鍓嶇鍙傛暟澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇鍓嶇鍙傛暟澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
struDeicing.read();
log.debug("鏄惁寮�鍚櫎鍐帮細" + struDeicing.byEnableDeicing);
@@ -1485,7 +1489,7 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("璁剧疆闀滃ご闄ゅ啺澶辫触: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("璁剧疆闀滃ご闄ゅ啺澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
return AjaxResult.success("璁剧疆闀滃ご闄ゅ啺鎴愬姛");
@@ -1502,14 +1506,14 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
NET_DVR_WORKSTATE_V30 devwork = new NET_DVR_WORKSTATE_V30();
if (!hCNetSDK.NET_DVR_GetDVRWorkState_V30(userId, devwork)) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�: errorCode" + code + " errorInfo" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇璁惧宸ヤ綔鐘舵�佸け璐�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
//鍥剧墖璐ㄩ噺
NET_DVR_JPEGPARA jpeg = new NET_DVR_JPEGPARA();
@@ -1610,8 +1614,10 @@
public String record(CameraCmd cmd) {
try {
String cameraId = cmd.getCameraId();
- Integer channelNum = cmd.getChanNo();
- String path = FileUtils.createFile("D:/recordTemp/" + cameraId + ".mp4");
+ Integer chanNo = cmd.getChanNo();
+ // 鏈湴涓存椂褰曞儚鍦板潃
+ 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 "";
@@ -1620,7 +1626,7 @@
//寮哄埗I甯х粨鏋勪綋瀵硅薄
HCNetSDK.NET_DVR_I_FRAME netDvrIFrame = new HCNetSDK.NET_DVR_I_FRAME(); //鏂板缓缁撴瀯浣撳璞�
netDvrIFrame.read();
- netDvrIFrame.dwChannel = channelNum;//鍥犱负涓婃枃浠ｇ爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
+ netDvrIFrame.dwChannel = chanNo;//鍥犱负涓婃枃浠ｇ爜涓缃簡閫氶亾鍙凤紝鎸夌収涓婃枃涓殑璁剧疆
netDvrIFrame.byStreamType = 0;
netDvrIFrame.dwSize = netDvrIFrame.size();
netDvrIFrame.write();
@@ -1630,7 +1636,7 @@
//棰勮鍙傛暟
NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
previewinfo.read();
- previewinfo.lChannel = channelNum;
+ previewinfo.lChannel = chanNo;
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琛ㄧず涓嶈В鐮佹樉绀恒��
@@ -1653,6 +1659,7 @@
return "";
}
log.debug("褰曞儚寮�濮�");
+
} else {
if (GlobalVariable.previewMap.containsKey(cameraId)) {
Integer lRealHandle = GlobalVariable.previewMap.get(cameraId);
@@ -1682,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;
}
@@ -1695,7 +1704,8 @@
netDvrIFrame.dwSize = netDvrIFrame.size();
netDvrIFrame.write();
if (!hCNetSDK.NET_DVR_RemoteControl(userId, 3402, netDvrIFrame.getPointer(), netDvrIFrame.dwSize)) {
- log.error("寮哄埗I甯� 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
+ int code = hCNetSDK.NET_DVR_GetLastError();
+ log.error("璁剧疆寮哄埗I甯ч敊璇�:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
//棰勮鍙傛暟
NET_DVR_PREVIEWINFO previewinfo = new NET_DVR_PREVIEWINFO();
@@ -1739,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 "";
}
@@ -1833,15 +1845,12 @@
}
//鑾峰彇IP閫氶亾
- public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
-
+ public List<ArdChannel> getChannels(ArdCameras camera) {
//鑾峰彇閫氶亾
List<ArdChannel> channelList = new ArrayList<>();
try {
- if (camera.getGdtype().equals("3")) {
- camera.setChanNum(64);//瓒呰剳鑾峰彇鍦ㄧ嚎閫氶亾鏁�
- camera.setStartDChan(0);//瓒呰剳鍒濆閫氶亾涓�0
- }
+ //鍒犻櫎绠＄悊閫氶亾
+ 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();
@@ -1851,16 +1860,15 @@
m_strIpparaCfg.read();
//log.debug("璧峰鏁板瓧閫氶亾鍙凤細" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
- ArdChannel ardChannel = new ArdChannel();
- int channum = iChannum + camera.getStartDChan() + 1;
+ 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();
strPicCfg.write();
Pointer pStrPicCfg = strPicCfg.getPointer();
- NativeLong lChannel = new NativeLong(channum);
+ 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());
}
@@ -1869,21 +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();
- ardChannel.setDeviceId(camera.getId());
- ardChannel.setName(channelName);
- ardChannel.setChanNo(channum);
- if (camera.getGdtype().equals("3")) {
- //瓒呰剳鍙幏鍙栧湪绾块�氶亾
- if (m_strIpparaCfg.struStreamMode[iChannum].uGetStream.struChanInfo.byEnable == 1) {
- //log.debug("IP閫氶亾" + channum + "鍦ㄧ嚎");
- channelList.add(ardChannel);
+ channelName = channelName.equals("") ? "閫氶亾" + chanNo : channelName;
+ 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) {
+ continue;
}
- } else {
- channelList.add(ardChannel);
}
+ channelList.add(channel);
}
+ ardChannelService.insertArdChannel(channel);
}
} catch (Exception ex) {
log.error("鑾峰彇IP閫氶亾寮傚父:" + ex.getMessage());
@@ -1904,7 +1912,7 @@
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
// 鑾峰彇鍙傛暟
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
@@ -1921,15 +1929,15 @@
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
- return AjaxResult.error("鑾峰彇GIS淇℃伅鏁版嵁澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鑾峰彇GIS淇℃伅鏁版嵁澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
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);
}
@@ -1938,11 +1946,14 @@
@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.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
//寮哄埗I甯х粨鏋勪綋瀵硅薄
@@ -1975,7 +1986,7 @@
if (lRealHandle == -1) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("鏈湴褰曞儚鍙栨祦澶辫触" + hCNetSDK.NET_DVR_GetLastError());
- return AjaxResult.error("鏈湴褰曞儚鍙栨祦澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ return AjaxResult.warn("鏈湴褰曞儚鍙栨祦澶辫触:" + SdkErrorCodeEnum.getDescByCode(code) + "(" + code + ")");
}
log.debug("鏈湴褰曞儚鍙栨祦鎴愬姛");
//GlobalVariable.threadMap.put(cameraId, Thread.currentThread().getName());
@@ -1983,10 +1994,10 @@
if (!hCNetSDK.NET_DVR_SaveRealData_V30(lRealHandle, 2, path)) {
int code = hCNetSDK.NET_DVR_GetLastError();
log.error("淇濆瓨瑙嗛鏂囦欢鍒颁复鏃舵枃浠跺す澶辫触 閿欒鐮佷负: " + hCNetSDK.NET_DVR_GetLastError());
- return AjaxResult.error("鏈湴褰曞儚鍙栨祦澶辫触: errorCode:" + code + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(code));
+ 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());
@@ -1997,12 +2008,13 @@
@Override
public AjaxResult localRecordStop(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
Integer channelNum = cmd.getChanNo();
Integer lRealHandle = cmd.getRecordId().intValue();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧鏈櫥褰�");
}
Integer userId = (Integer) GlobalVariable.loginMap.get(cameraId);
//region 寮哄埗I甯�
@@ -2027,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