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 | 368 ++++++++++++++++++++++------------------------------
1 files changed, 155 insertions(+), 213 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 fd31780..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
@@ -4,44 +4,41 @@
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;
-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;
@@ -49,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;
@@ -71,6 +67,9 @@
private IArdChannelService ardChannelService;
@Resource
private IVtduService vtduService;
+
+ @Resource
+ ICameraSdkService cameraSdkService;
@Value("${minio.endpoint}")
private String minioEndPoint;
@Resource
@@ -97,84 +96,36 @@
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);
//删除管理通道
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
- if (GlobalVariable.loginMap.containsKey(camera.getId())) {
- GlobalVariable.loginMap.remove(camera.getId());
- }
- //删除管理通道
- ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ 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());
- ardCamerasService.updateArdCameras(camera);
+ camera.setStartChan(1);
+ camera.setLoginId(loginId.longValue());
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) {
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ ardChannelList.stream().forEach(channel -> {
+ ardChannelService.insertArdChannel(channel);
+ });
+ camera.setChannelList(ardChannelList);
+ //通道批量添加到流媒体
+ batchAddVtdu(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);
- }
-
+ ardCamerasService.updateArdCameras(camera);
//创建引导队列
- 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);
+ //加入已登录设备集合
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("设备登录成功");
} catch (Exception ex) {
log.error("设备登录异常:" + ex.getMessage());
@@ -191,50 +142,38 @@
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);
//删除管理通道
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
log.error("设备[" + camera.getIp() + ":" + camera.getPort() + "]登录失败:" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(getErrorCodePrint());
}
- if (GlobalVariable.loginMap.containsKey(camera.getId())) {
- GlobalVariable.loginMap.remove(camera.getId());
- }
- //删除管理通道
- ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ 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);
//获取最新通道
- 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) {
+ ardChannelService.deleteArdChannelByDeviceId(camera.getId());
+ ardChannelList.stream().forEach(channel -> {
+ ardChannelService.insertArdChannel(channel);
+ });
+ camera.setChannelList(ardChannelList);
+ //通道批量添加到流媒体
+ batchAddVtdu(camera);
}
- //配置到流媒体
- addVtdu(camera);
+ ardCamerasService.updateArdCameras(camera);
//创建引导队列
createGuideQueue(camera);
+ //加入已登录设备集合
+ GlobalVariable.loginedSet.add(camera);
return AjaxResult.success("登录成功");
} catch (Exception ex) {
log.error("登录异常:" + ex.getMessage());
@@ -242,45 +181,49 @@
}
}
- //添加到流媒体
- private void addVtdu(ArdCameras camera) {
- for (int i = 1; i < camera.getChanNum() + 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);
- }
+ //通道批量添加到流媒体
+ public void batchAddVtdu(ArdCameras camera) {
+ camera.getChannelList().stream().forEach(channel -> {
+ vtduService.addChanToVtdu(camera, channel);
+ });
}
+
//创建引导队列
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) {
+ 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).trim();
+ 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);
+ }
+ return ardChannelList;
}
/**
@@ -339,7 +282,7 @@
Integer speed = cmd.getSpeed();
Integer code = cmd.getCode();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
int dwStop;
@@ -406,7 +349,7 @@
boolean bool = PtzControlModule.ptzControl(loginId, chanNo - 1, dwPTZCommand, speed, speed, 0, dwStop);
if (!bool) {
log.error("控制失败,请稍后重试" + getErrorCodePrint());
- return AjaxResult.error(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
+ return AjaxResult.warn(ErrorCode.getErrorCode(LoginModule.netsdk.CLIENT_GetLastError()));
}
return AjaxResult.success("云台控制成功");
}
@@ -421,7 +364,7 @@
Map<String, Object> ptzMap = new HashMap<>();
String cameraId = cmd.getCameraId();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
NetSDKLib.LLong loginId = (NetSDKLib.LLong) GlobalVariable.loginMap.get(cameraId);
NetSDKLib.NET_PTZ_LOCATION_INFO dh_ptz_location_info = new NetSDKLib.NET_PTZ_LOCATION_INFO();
@@ -429,7 +372,7 @@
if (!b) {
int code = netsdk.CLIENT_GetLastError();
log.error("设置ptz失败:" + getErrorCodePrint());
- return AjaxResult.error("设置ptz失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
}
DecimalFormat df = new DecimalFormat("0.0");//设置保留位数
String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
@@ -472,12 +415,12 @@
Integer chanNo = cmd.getChanNo();
Map<String, Double> ptz = cmd.getPtzMap();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
if (ptz.get("p") == null || ptz.get("t") == null || ptz.get("z") == null) {
- return AjaxResult.error("ptz参数不能为空");
+ return AjaxResult.warn("ptz参数不能为空");
}
int p = (int) (ptz.get("p") * 10);
int t = (int) (ptz.get("t") * 10);
@@ -487,7 +430,7 @@
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
log.error("设置ptz失败:" + getErrorCodePrint());
- return AjaxResult.error("设置ptz失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
}
return AjaxResult.success("设置ptz成功");
} catch (Exception ex) {
@@ -510,13 +453,13 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
boolean bool = NetSDKLib.NETSDK_INSTANCE.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RESETZERO, 0, 0, 0, 0);
if (!bool) {
log.error("设置零方位角失败:" + getErrorCodePrint());
- return AjaxResult.error("设置ptz失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
}
return AjaxResult.success("设置零方位角成功");
}
@@ -556,26 +499,27 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ 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);
- if (b) {
- Thread.sleep(200);
- byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
- //OutputStream outputStream = response.getOutputStream();
- //outputStream.write(imageBytes);
- // 创建ByteBuffer并将字节数组写入其中
- //ByteBuffer jpegBuffer = ByteBuffer.wrap(imageBytes);
- //Base64.Encoder decoder = Base64.getEncoder();
- //String png_base64 = decoder.encodeToString(jpegBuffer.array());//转换成base64串
- return AjaxResult.success(imageBytes);
- } else {
- return AjaxResult.error("本地抓图失败");
+ if (!b) {
+ return AjaxResult.warn("本地抓图失败");
}
+ Thread.sleep(200);
+ byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
+ //OutputStream outputStream = response.getOutputStream();
+ //outputStream.write(imageBytes);
+ // 创建ByteBuffer并将字节数组写入其中
+ //ByteBuffer jpegBuffer = ByteBuffer.wrap(imageBytes);
+ //Base64.Encoder decoder = Base64.getEncoder();
+ //String png_base64 = decoder.encodeToString(jpegBuffer.array());//转换成base64串
+ return AjaxResult.success(imageBytes);
} catch (Exception ex) {
return AjaxResult.error("本地抓图异常:" + ex);
}
@@ -585,11 +529,12 @@
@Override
public AjaxResult localRecordStart(CameraCmd cmd) {
try {
+ String operator = cmd.getOperator();
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
//if (GlobalVariable.previewMap.containsKey(cameraId)) {
@@ -598,7 +543,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());
@@ -611,43 +559,30 @@
// return false;
//}
log.debug("本地录像开始");
- return AjaxResult.success("本地录像开始",lRealHandle);
+ return AjaxResult.success("本地录像开始", lRealHandle);
} catch (Exception ex) {
log.error("本地录像开始异常" + ex.getMessage());
return AjaxResult.error("本地录像开始异常" + ex.getMessage());
}
}
+
//本地录像停止
@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.error("设备未登录");
+ 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 +603,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 +644,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 +682,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 +734,6 @@
return result;
}
- @Override
- public List<ArdChannel> getIPChannelInfo(ArdCameras camera) {
- return null;
- }
/**
* 引导目标位置
@@ -808,7 +745,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -816,15 +753,18 @@
double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
double[] targetPositions = cmd.getTargetPosition();
double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
+ //修正俯仰
+ double correctPitch = cameraSdkService.correctPitch(cmd);
+ double newt = cameraPTZ[1] + correctPitch;
int p = (int) (cameraPTZ[0] * 10);
- int t = (int) (cameraPTZ[1] * 10);
+ int t = (int) (newt * 10);
int z = (int) (cameraPTZ[2]);
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
log.error("设置ptz失败:" + getErrorCodePrint());
- return AjaxResult.error("设置ptz失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置ptz失败:" + getErrorCodePrint());
}
- return AjaxResult.success("引导目标位置成功");
+ return AjaxResult.success("引导目标位置成功", correctPitch);
} catch (Exception ex) {
log.error("引导目标位置异常:" + ex.getMessage());
return AjaxResult.error("引导目标位置异常:" + ex.getMessage());
@@ -838,14 +778,14 @@
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_MOVE_CONTROL, 0, PresetIndex, 0, 0);
if (!bool) {
log.error("转至预置点失败:" + getErrorCodePrint());
- return AjaxResult.error("转至预置点失败:" + getErrorCodePrint());
+ return AjaxResult.warn("转至预置点失败:" + getErrorCodePrint());
}
return AjaxResult.success("转至预置点成功");
} catch (Exception ex) {
@@ -861,14 +801,14 @@
Integer chanNo = cmd.getChanNo();
Integer PresetIndex = cmd.getPresetIndex();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NET_PTZ_POINT_SET_CONTROL, 0, PresetIndex, 0, 0);
if (!bool) {
log.error("设置预置点失败:" + getErrorCodePrint());
- return AjaxResult.error("设置预置点失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置预置点失败:" + getErrorCodePrint());
}
return AjaxResult.success("设置预置点成功");
} catch (Exception ex) {
@@ -884,7 +824,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -909,7 +849,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, NetSDKLib.CFG_CMD_VIDEOIN_FOCUS, cfg_video_in_focus);
if (!bool) {
log.error("切换聚焦模式失败:" + getErrorCodePrint());
- return AjaxResult.error("切换聚焦模式失败:" + getErrorCodePrint());
+ return AjaxResult.warn("切换聚焦模式失败:" + getErrorCodePrint());
}
return AjaxResult.success("切换聚焦模式成功");
} catch (Exception ex) {
@@ -925,7 +865,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -934,7 +874,7 @@
boolean bool = ConfigModule.GetConfig(loginId, chanNo - 1, emCfgOpType, focusModeInfo);
if (!bool) {
log.error("获取聚焦模式失败:" + getErrorCodePrint());
- return AjaxResult.error("获取聚焦模式失败:" + getErrorCodePrint());
+ return AjaxResult.warn("获取聚焦模式失败:" + getErrorCodePrint());
}
//System.out.println("配置类型:" + focusModeInfo.emCfgType); // 具体信息，参考库里的枚举
//System.out.println("聚焦模式:" + focusModeInfo.emFocusMode);
@@ -985,7 +925,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -994,7 +934,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, netVideoinDefogInfo);
if (!bool) {
log.error("切换透雾失败:" + getErrorCodePrint());
- return AjaxResult.error("切换透雾失败:" + getErrorCodePrint());
+ return AjaxResult.warn("切换透雾失败:" + getErrorCodePrint());
}
return AjaxResult.success("切换透雾成功");
} catch (Exception ex) {
@@ -1008,7 +948,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -1016,7 +956,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_INFRARED_CONFIG, cfg_infrared_info);
if (!bool) {
log.error("切换红外失败:" + getErrorCodePrint());
- return AjaxResult.error("切换红外失败:" + getErrorCodePrint());
+ return AjaxResult.warn("切换红外失败:" + getErrorCodePrint());
}
return AjaxResult.success("切换红外成功");
} catch (Exception ex) {
@@ -1032,7 +972,7 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
NET_PTZ_LOCATION_INFO net_ptz_location_info = new NET_PTZ_LOCATION_INFO();
@@ -1040,7 +980,7 @@
boolean bool = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_LOCATION, net_ptz_location_info);
if (!bool) {
log.error("获取聚焦值失败:" + getErrorCodePrint());
- return AjaxResult.error("获取聚焦值失败:" + getErrorCodePrint());
+ return AjaxResult.warn("获取聚焦值失败:" + getErrorCodePrint());
}
result = net_ptz_location_info.nFocusMapValue;
return AjaxResult.success(result);
@@ -1058,7 +998,7 @@
Integer chanNo = cmd.getChanNo();
boolean enable = cmd.isEnable();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
@@ -1072,7 +1012,7 @@
boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, CFG_CMD_LIGHTING, cfg_lighting_info);
if (!bool) {
log.error("设置聚焦值失败:" + getErrorCodePrint());
- return AjaxResult.error("设置聚焦值失败:" + getErrorCodePrint());
+ return AjaxResult.warn("设置聚焦值失败:" + getErrorCodePrint());
}
return AjaxResult.success("设置聚焦值成功");
} catch (Exception ex) {
@@ -1156,14 +1096,14 @@
String cameraId = cmd.getCameraId();
Integer chanNo = cmd.getChanNo();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
- return AjaxResult.error("设备未登录");
+ return AjaxResult.warn("设备未登录");
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
DH_OUT_PTZ_VIEW_RANGE_STATUS dh_out_ptz_view_range_status = new DH_OUT_PTZ_VIEW_RANGE_STATUS();
boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_VIEW_RANGE, dh_out_ptz_view_range_status);
if (!b) {
log.error("获取云台可视域失败:" + getErrorCodePrint());
- return AjaxResult.error("获取云台可视域失败:" + getErrorCodePrint());
+ return AjaxResult.warn("获取云台可视域失败:" + getErrorCodePrint());
}
float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
@@ -1226,9 +1166,11 @@
// 抓图接收回调:当抓图成功，sdk会调用该函数
public static class fCaptureReceiveCB1 implements NetSDKLib.fSnapRev {
private String picPath;
+
public fCaptureReceiveCB1(String picPath) {
this.picPath = picPath;
}
+
public void invoke(LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser) {
if (pBuf != null && RevLen > 0) {
byte[] buf = pBuf.getByteArray(0, RevLen);
--
Gitblit v1.9.3