From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 83 ++++++++++++++---------------------------
1 files changed, 29 insertions(+), 54 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 3957ce6..fe9af52 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
@@ -7,45 +7,38 @@
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;
import com.ruoyi.common.utils.uuid.IdUtils;
-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.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.minio.MinioUtil;
import com.ruoyi.utils.sdk.common.GlobalVariable;
-import com.ruoyi.utils.sdk.common.SdkErrorCodeEnum;
import com.ruoyi.utils.sdk.dhsdk.common.ErrorCode;
import com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib;
-import com.ruoyi.utils.sdk.dhsdk.lib.ToolKits;
import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.EM_NEW_CONFIG;
import com.ruoyi.utils.sdk.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE;
import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_INFRARED_INFO;
import com.ruoyi.utils.sdk.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS;
import com.ruoyi.utils.sdk.dhsdk.lib.structure.DH_OUT_PTZ_VIEW_RANGE_STATUS;
import com.ruoyi.utils.sdk.dhsdk.module.*;
-import com.sun.jna.Native;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
import java.io.*;
-import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.DecimalFormat;
@@ -53,7 +46,6 @@
import java.util.concurrent.PriorityBlockingQueue;
import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.*;
-import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_DEVSTATE_PTZ_VIEW_RANGE;
import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL;
import static com.ruoyi.utils.sdk.dhsdk.lib.NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL;
import static com.ruoyi.utils.sdk.dhsdk.lib.ToolKits.getErrorCodePrint;
@@ -104,7 +96,7 @@
NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
if (loginId.longValue() <= 0) {
camera.setChanNum(0);
- camera.setLoginId(-1);
+ camera.setLoginId(-1l);
camera.setState("0");
ardCamerasService.updateArdCameras(camera);
//删除管理通道
@@ -112,11 +104,11 @@
log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
-
+ log.debug("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录成功:" + (int) loginId.longValue());
camera.setState("1");
camera.setChanNum(m_stDeviceInfo.byChanNum);
- camera.setStartDChan(1);
- camera.setLoginId((int) loginId.longValue());
+ camera.setStartChan(1);
+ camera.setLoginId(loginId.longValue());
GlobalVariable.loginMap.put(camera.getId(), loginId);
//获取最新通道
List<ArdChannel> ardChannelList = getChannels(camera);
@@ -125,14 +117,15 @@
ardChannelList.stream().forEach(channel -> {
ardChannelService.insertArdChannel(channel);
});
- camera.setChanNum(ardChannelList.size());
camera.setChannelList(ardChannelList);
- ardCamerasService.updateArdCameras(camera);
- //配置到流媒体
- addVtdu(camera);
+ //通道批量添加到流媒体
+ batchAddVtdu(camera);
}
+ ardCamerasService.updateArdCameras(camera);
//创建引导队列
createGuideQueue(camera);
+ //加入已登录设备集合
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("设备登录成功");
} catch (Exception ex) {
log.error("设备登录异常:" + ex.getMessage());
@@ -149,7 +142,7 @@
NetSDKLib.LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword(), m_stDeviceInfo);
if (loginId.longValue() <= 0) {
camera.setChanNum(0);
- camera.setLoginId(-1);
+ camera.setLoginId(-1l);
camera.setState("0");
ardCamerasService.updateArdCameras(camera);
//删除管理通道
@@ -157,10 +150,11 @@
log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
return AjaxResult.warn(getErrorCodePrint());
}
+ log.debug("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录成功:" + loginId);
camera.setState("1");
camera.setChanNum(m_stDeviceInfo.byChanNum);
- camera.setStartDChan(1);
- camera.setLoginId((int) loginId.longValue());
+ camera.setStartChan(1);
+ camera.setLoginId(loginId.longValue());
ardCamerasService.updateArdCameras(camera);
GlobalVariable.loginMap.put(camera.getId(), loginId);
@@ -171,14 +165,15 @@
ardChannelList.stream().forEach(channel -> {
ardChannelService.insertArdChannel(channel);
});
- camera.setChanNum(ardChannelList.size());
camera.setChannelList(ardChannelList);
- ardCamerasService.updateArdCameras(camera);
- //配置到流媒体
- addVtdu(camera);
+ //通道批量添加到流媒体
+ batchAddVtdu(camera);
}
+ ardCamerasService.updateArdCameras(camera);
//创建引导队列
createGuideQueue(camera);
+ //加入已登录设备集合
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("登录成功");
} catch (Exception ex) {
log.error("登录异常:" + ex.getMessage());
@@ -186,35 +181,13 @@
}
}
- //添加到流媒体
- private void addVtdu(ArdCameras camera) {
+ //通道批量添加到流媒体
+ public void batchAddVtdu(ArdCameras camera) {
camera.getChannelList().stream().forEach(channel -> {
- String name = camera.getId() + "_" + channel.getChanNo();
- String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + channel.getChanNo() + "&subtype=0";
- //删除流媒体
- if (vtduService.selectVtduByName(name) != null) {
- vtduService.deleteVtduByName(name);
- }
- //添加到流媒体
- CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());
- Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);
- Vtdu 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(name);
- vtdu.setMode("1");//默认CPU软解码
- vtdu.setCameraId(camera.getId());
- vtduService.insertVtdu(vtdu);
+ vtduService.addChanToVtdu(camera, channel);
});
}
+
//创建引导队列
private void createGuideQueue(ArdCameras camera) {
@@ -231,12 +204,14 @@
//获取通道
public List<ArdChannel> getChannels(ArdCameras camera) {
+ if (camera.getLoginId() < 0) {
+ return new ArrayList<>();
+ }
LLong loginId = new LLong(camera.getLoginId());
List<ArdChannel> ardChannelList = new ArrayList<>();
for (int i = 1; i < camera.getChanNum() + 1; i++) {
ArdChannel channel = new ArdChannel();
- String chanName = ConfigModule.getChannelName(loginId, i - 1).trim();
- log.debug("获取通道名称：" + chanName);
+ String chanName = ConfigModule.getChannelName(loginId, i).trim();
channel.setName(chanName.equals("") ? "通道" + i : chanName);
channel.setDeviceId(camera.getId());
channel.setChanNo(i);
--
Gitblit v1.9.3