From cf4afcc8902efc85f1e71f26073404a0a7a4f204 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 31 七月 2024 09:48:41 +0800
Subject: [PATCH] 修改：异步async指定线程池
---
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 171 +++++++++++++++++++++++---------------------------------
1 files changed, 70 insertions(+), 101 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 ae93c60..e622d1c 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
@@ -9,18 +9,14 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.device.camera.service.IArdCamerasService;
-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.factory.CameraSDK;
+import com.ruoyi.device.camera.service.IArdCamerasService;
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;
import com.ruoyi.utils.minio.MinioUtil;
@@ -33,11 +29,12 @@
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
@@ -46,10 +43,8 @@
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;
/**
* @Description: 娴峰悍sdk绛栫暐
@@ -94,7 +89,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();
@@ -125,7 +120,7 @@
if (lUserID < 0) {
int errorCode = hCNetSDK.NET_DVR_GetLastError();
camera.setChanNum(0);
- camera.setLoginId(-1);
+ camera.setLoginId(-1l);
camera.setState("0");
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
@@ -144,13 +139,9 @@
log.debug("Set fExceptionCallBack function successfully!");
}
}
-
-// 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.setLoginId((long) lUserID);
camera.setState("1");
int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
@@ -159,21 +150,27 @@
startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
}
camera.setChanNum(chanNum);
- camera.setStartDChan(startDchan);
+ camera.setStartChan(startDchan);
//鑾峰彇鏈�鏂伴�氶亾
List<ArdChannel> cameraChannelList = getChannels(camera);
if (cameraChannelList.size() > 0) {
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ cameraChannelList.stream().forEach(channel -> {
+ ardChannelService.insertArdChannel(channel);
+ });
camera.setChannelList(cameraChannelList);
- camera.setChanNum(cameraChannelList.size());
- ardCamerasService.updateArdCameras(camera);
- //娣诲姞鍒版祦濯掍綋
- addVtdu(camera);
+ //camera.setChanNum(cameraChannelList.size());
+ //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+ batchAddVtdu(camera);
}
+ ardCamerasService.updateArdCameras(camera);
//鍒涘缓寮曞闃熷垪
createGuideQueue(camera);
+ //鍔犲叆宸茬櫥褰曡澶囬泦鍚�
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("璁惧鐧诲綍寮傚父" , ex);
+ log.error("璁惧鐧诲綍寮傚父", ex);
return AjaxResult.error("璁惧鐧诲綍寮傚父" + ex.getMessage());
}
}
@@ -187,7 +184,7 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- @Async("loginExecutor")
+ @Async("globalExecutor")
public AjaxResult asyncLogin(ArdCameras camera) {
try {
// 鍒濆鍖�
@@ -200,7 +197,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();
@@ -231,7 +228,7 @@
if (lUserID < 0) {
int errorCode = hCNetSDK.NET_DVR_GetLastError();
camera.setChanNum(0);
- camera.setLoginId(-1);
+ camera.setLoginId(-1l);
camera.setState("0");
//鍒犻櫎绠＄悊閫氶亾
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
@@ -240,23 +237,10 @@
return AjaxResult.warn("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: " + SdkErrorCodeEnum.getDescByCode(errorCode) + "(" + errorCode + ")");
}
log.debug("Login Success 銆� " + camera.getIp() + ":" + camera.getPort() + " 銆�");
- synchronized (_lock) {
- if (fExceptionCallBack == null) {
- fExceptionCallBack = new ExceptionCallBack();//寮傚父鍥炶皟
- //璁剧疆寮傚父鍥炶皟鍑芥暟(鍙湪鍥炶皟鍑芥暟涓幏鍙栬澶囦笂涓嬬嚎鐘舵�佺瓑)
- if (!hCNetSDK.NET_DVR_SetExceptionCallBack_V30(0, 0, fExceptionCallBack, null)) {
- log.debug("Set fExceptionCallBack function fail");
- } else {
- log.debug("Set fExceptionCallBack function successfully!");
- }
- }
- }
-// 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.setLoginId((long) lUserID);
camera.setState("1");
int chanNum = m_strDeviceInfo.struDeviceV30.byChanNum;
int startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan + 1;
@@ -265,21 +249,27 @@
startDchan = m_strDeviceInfo.struDeviceV30.byStartDChan;
}
camera.setChanNum(chanNum);
- camera.setStartDChan(startDchan);
+ camera.setStartChan(startDchan);
//鑾峰彇鏈�鏂伴�氶亾
List<ArdChannel> cameraChannelList = getChannels(camera);
if (cameraChannelList.size() > 0) {
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ cameraChannelList.stream().forEach(channel -> {
+ ardChannelService.insertArdChannel(channel);
+ });
camera.setChannelList(cameraChannelList);
- camera.setChanNum(cameraChannelList.size());
- ardCamerasService.updateArdCameras(camera);
- //娣诲姞鍒版祦濯掍綋
- addVtdu(camera);
+ //camera.setChanNum(cameraChannelList.size());
+ //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+ batchAddVtdu(camera);
}
+ ardCamerasService.updateArdCameras(camera);
//鍒涘缓寮曞闃熷垪
createGuideQueue(camera);
+ //鍔犲叆宸茬櫥褰曡澶囬泦鍚�
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("娉ㄥ唽璁惧寮傚父" , ex);
+ log.error("娉ㄥ唽璁惧寮傚父", ex);
return AjaxResult.error("娉ㄥ唽璁惧寮傚父" + ex.getMessage());
}
}
@@ -297,36 +287,18 @@
}
}
- //娣诲姞鍒版祦濯掍綋
- private void addVtdu(ArdCameras camera) {
+ //閫氶亾鎵归噺娣诲姞鍒版祦濯掍綋
+ public void batchAddVtdu(ArdCameras camera) {
try {
- for (ArdChannel channel : camera.getChannelList()) {
- String name = camera.getId() + "_" + channel.getChanNo();
- String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/h264/ch" + channel.getChanNo() + "/main/av_stream";
- Vtdu vtdu = vtduService.selectVtduByName(name);
- if (vtdu != null) {
- vtduService.deleteVtduByName(name);
- }
- //娣诲姞鍒版祦濯掍綋
- vtdu = new Vtdu();
- vtdu.setRtspSource(rtspSource);
- vtdu.setName(camera.getId() + "_" + channel.getChanNo());
- CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());
- Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
- if (videoCompressionCfg.get("videoEncType").equals("鏍囧噯h264")) {
- vtdu.setIsCode("0");//榛樿涓嶈浆鐮�
- } else {
- vtdu.setIsCode("1");//榛樿杞爜
- }
- vtdu.setMode("1");//榛樿CPU杞В鐮�
- vtdu.setCameraId(camera.getId());
- vtduService.insertVtdu(vtdu);
- }
+ camera.getChannelList().stream().forEach(channel -> {
+ vtduService.addChanToVtdu(camera, channel);
+ });
} catch (Exception ex) {
log.error("閫氶亾娣诲姞鍒版祦濯掍綋寮傚父锛�" + ex.getMessage());
}
}
+
/**
* @鎻忚堪 娉ㄩ攢鐧诲綍
@@ -873,10 +845,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();
@@ -929,9 +901,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);
}
@@ -978,9 +950,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());
@@ -1085,7 +1057,7 @@
return AjaxResult.success("璁剧疆楂樼簿搴TZ鍙傛暟鎴愬姛");
} catch (Exception ex) {
- log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父" , ex);
+ log.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父", ex);
return AjaxResult.error("璁剧疆楂樼簿搴TZ鍙傛暟寮傚父:" + ex);
}
}
@@ -1123,7 +1095,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());
@@ -1232,12 +1204,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);
}
}
@@ -1333,7 +1305,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("鍒囨崲绾㈠鎴愬姛");
@@ -1849,26 +1821,24 @@
//鑾峰彇閫氶亾
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();
//lpIpParaConfig 鎺ユ敹鏁版嵁鐨勭紦鍐叉寚閽�
Pointer lpIpParaConfig = m_strIpparaCfg.getPointer();
- boolean bRet = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId(), HCNetSDK.NET_DVR_GET_IPPARACFG_V40, 0, lpIpParaConfig, m_strIpparaCfg.size(), ibrBytesReturned);
+ boolean bRet = hCNetSDK.NET_DVR_GetDVRConfig(camera.getLoginId().intValue(), HCNetSDK.NET_DVR_GET_IPPARACFG_V40, 0, lpIpParaConfig, m_strIpparaCfg.size(), ibrBytesReturned);
m_strIpparaCfg.read();
//log.debug("璧峰鏁板瓧閫氶亾鍙凤細" + m_strIpparaCfg.dwStartDChan);//m_strIpparaCfg.dwDChanNum
for (int iChannum = 0; iChannum < camera.getChanNum(); iChannum++) {
ArdChannel channel = new ArdChannel();
- int chanNo = iChannum + camera.getStartDChan();
+ int chanNo = iChannum + camera.getStartChan();
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(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().intValue(), HCNetSDK.NET_DVR_GET_PICCFG_V40, lChannel.intValue(), pStrPicCfg, strPicCfg.size(), pInt);
if (!b_GetPicCfg) {
// log.error("鑾峰彇鍥惧儚鍙傛暟澶辫触锛岄敊璇爜锛�" + hCNetSDK.NET_DVR_GetLastError());
}
@@ -1891,7 +1861,6 @@
}
channelList.add(channel);
}
- ardChannelService.insertArdChannel(channel);
}
} catch (Exception ex) {
log.error("鑾峰彇IP閫氶亾寮傚父:" + ex.getMessage());
@@ -1933,11 +1902,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);
}
@@ -1997,7 +1966,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());
--
Gitblit v1.9.3