From 49bedcce2ac42fa34da012ee3fc8e9230886064a Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期五, 12 七月 2024 15:28:24 +0800
Subject: [PATCH] 优化：流媒体
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 319 +++++++++++++++++++++++++++--------------------------
1 files changed, 162 insertions(+), 157 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index e3aac54..eb62b1c 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -18,19 +18,20 @@
import com.ruoyi.device.camera.factory.CameraSDKFactory;
import com.ruoyi.device.noguidezone.domain.ArdCameraNoGuideZone;
import com.ruoyi.device.noguidezone.service.IArdCameraNoGuideZoneService;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+import com.ruoyi.device.terrain.service.IArdTerrainMarkService;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
import com.ruoyi.utils.sdk.common.GlobalVariable;
import com.ruoyi.utils.tools.ArdTool;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -52,6 +53,8 @@
private IArdAlarmpointsWellService ardAlarmpointsWellService;
@Resource
private IArdCameraNoGuideZoneService ardCameraNoGuideZoneService;
+ @Resource
+ private IArdTerrainMarkService ardTerrainMarkService;
/**
* 鍚姩绾跨▼鏂规硶锛岀敤浜庢墽琛屽垵濮嬪寲鐧诲綍鐩告満鐨勯�昏緫
@@ -61,24 +64,21 @@
@Override
public void run(ApplicationArguments args) {
try {
- // 浠巃rdCamerasService涓幏鍙朅rdCameras鍒楄〃
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras camera : ardCameras) {
asyncLogin(camera);
}
} catch (Exception ex) {
- // 鍒濆鍖栫櫥褰曠浉鏈哄紓甯革紝璁板綍閿欒鏃ュ織
log.error("鍒濆鍖栫櫥褰曠浉鏈哄紓甯革細" + ex.getMessage());
}
}
-
//鍚屾鐧诲綍
@Override
public AjaxResult login(ArdCameras ardCamera) {
try {
if (ardCamera == null) {
- return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
@@ -93,7 +93,7 @@
public AjaxResult asyncLogin(ArdCameras ardCamera) {
try {
if (ardCamera == null) {
- return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
@@ -146,13 +146,12 @@
public AjaxResult pTZControl(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.pTZControl(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.pTZControl(cmd);
}
//璁剧疆鑱氱劍鍊�
@@ -161,13 +160,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.setFocusPos(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setFocusPos(cmd);
} catch (Exception ex) {
log.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
return AjaxResult.error("璁剧疆鑱氱劍鍊煎紓甯革細" + ex.getMessage());
@@ -180,13 +178,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getFocusPos(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getFocusPos(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍鍊煎紓甯革細" + ex.getMessage());
return AjaxResult.error("鑾峰彇鑱氱劍鍊煎紓甯�:" + ex.getMessage());
@@ -199,13 +196,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.setPreset(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setPreset(cmd);
} catch (Exception ex) {
log.error("璁剧疆棰勭疆浣嶅紓甯革細" + ex.getMessage());
return AjaxResult.error("璁剧疆棰勭疆浣嶅紓甯�" + ex.getMessage());
@@ -218,13 +214,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.gotoPreset(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.gotoPreset(cmd);
} catch (Exception ex) {
log.error("璋冪敤棰勭疆浣嶅紓甯革細" + ex.getMessage());
return AjaxResult.error("璋冪敤棰勭疆浣嶅紓甯�" + ex.getMessage());
@@ -238,11 +233,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- map = cameraSDK.getVideoCompressionCfg(cmd);
+ if (ardCamera == null) {
+ return new HashMap<>();
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ map = cameraSDK.getVideoCompressionCfg(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鐮佹祦鍘嬬缉鍙傛暟寮傚父锛�" + ex.getMessage());
}
@@ -255,13 +251,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.controlDefogcfg(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlDefogcfg(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶閫忛浘寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶閫忛浘寮傚父" + ex.getMessage());
@@ -274,13 +269,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.controlInfrarecfg(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlInfrarecfg(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶绾㈠寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶绾㈠寮傚父:" + ex.getMessage());
@@ -293,13 +287,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.controlFocusMode(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlFocusMode(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶鑱氱劍妯″紡寮傚父:" + ex.getMessage());
@@ -312,13 +305,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getFocusMode(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getFocusMode(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇鑱氱劍妯″紡寮傚父锛�" + ex.getMessage());
@@ -328,38 +320,33 @@
//浜戝彴鍔犵儹
@Override
public AjaxResult controlPTHeateRpwron(CameraCmd cmd) {
-
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.controlPTHeateRpwron(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlPTHeateRpwron(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父:" + ex.getMessage());
}
-
}
//闀滃ご鍔犵儹
@Override
public AjaxResult controlCameraDeicing(CameraCmd cmd) {
-
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.controlCameraDeicing(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.controlCameraDeicing(cmd);
} catch (Exception ex) {
log.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鎿嶆帶浜戝彴鍔犵儹寮傚父锛�" + ex.getMessage());
@@ -372,13 +359,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getPTZLockInfo(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getPTZLockInfo(cmd);
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
return AjaxResult.error("鑾峰彇浜戝彴閿佸畾淇℃伅寮傚父:" + ex.getMessage());
@@ -391,15 +377,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.localCapture(cmd);
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
- else
- {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
- }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localCapture(cmd);
} catch (Exception ex) {
log.error("鎵嬪姩鎶撳浘寮傚父:" + ex.getMessage());
return AjaxResult.error("鎵嬪姩鎶撳浘寮傚父:" + ex.getMessage());
@@ -434,17 +417,16 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- String gdtype = ardCamera.getGdtype();
- if (gdtype.equals("1")) {
- return cameraSDK.getPtzHigh(cmd);
- } else {
- return cameraSDK.getPtz(cmd);
- }
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
+ }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ String gdtype = ardCamera.getGdtype();
+ if (gdtype.equals("1")) {
+ return cameraSDK.getPtzHigh(cmd);
} else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ return cameraSDK.getPtz(cmd);
}
} catch (Exception ex) {
log.error("鑾峰彇ptz寮傚父锛�" + ex.getMessage());
@@ -458,13 +440,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getPtzScope(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getPtzScope(cmd);
} catch (Exception ex) {
log.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇ptz鑼冨洿寮傚父锛�" + ex.getMessage());
@@ -478,7 +459,7 @@
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
if (ardCamera == null) {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(ardCamera.getFactory());
String gdtype = ardCamera.getGdtype();
@@ -488,7 +469,6 @@
} else {
return cameraSDK.setPtz(cmd);
}
-
} catch (Exception ex) {
log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
@@ -501,13 +481,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.setZeroPtz(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.setZeroPtz(cmd);
} catch (Exception ex) {
log.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
return AjaxResult.error("璁剧疆闆舵柟浣嶈寮傚父锛�" + ex.getMessage());
@@ -520,17 +499,47 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.guideTargetPosition(cmd);
- } else {
- return AjaxResult.error("鎽勫儚澶翠笉瀛樺湪");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.guideTargetPosition(cmd);
} catch (Exception ex) {
log.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
return AjaxResult.error("寮曞鎸囧悜鐩爣寮傚父:" + ex.getMessage());
}
+ }
+
+ /**
+ * @return
+ * @Author 鍒樿嫃涔�
+ * @Description 淇淇话鍊硷紙鏍规嵁鐩告満ID鑾峰彇500绫宠寖鍥村唴鐨勫湴褰㈠弬鏁伴泦鍚堬紝璁＄畻骞冲潎鍊煎姞涓奣鍊硷級
+ * @Date 2024/6/22 11:16
+ * @Param
+ */
+ @Override
+ public Double correctPitch(CameraCmd cmd) {
+ Double pitchAngle = 0.0;
+ try {
+ double[] targetPositions = cmd.getTargetPosition();
+ ArdTerrainMark ardTerrainMark = new ArdTerrainMark();
+ ardTerrainMark.setCameraId(cmd.getCameraId());
+ List<ArdTerrainMark> ardTerrainMarks = ardTerrainMarkService.selectArdTerrainMarkList(ardTerrainMark);
+ //杩囨护500绫宠寖鍥村唴鐨勯泦鍚�
+ ardTerrainMarks = ardTerrainMarks.stream().filter(n -> GisUtil.getDistance(targetPositions, new double[]{n.getLongitude(), n.getLatitude(), n.getAltitude()}) <= 500).collect(Collectors.toList());
+ //璁＄畻T骞冲潎鍊�
+ OptionalDouble averageT = ardTerrainMarks.stream().mapToDouble(ArdTerrainMark::getT).average();
+ // 杈撳嚭
+ if (averageT.isPresent()) {
+ pitchAngle = averageT.getAsDouble();
+ log.debug("淇淇话鍊硷細" + pitchAngle);
+ }
+ } catch (Exception ex) {
+ log.error("淇淇话鍊煎紓甯革細" + ex.getMessage());
+
+ }
+ return pitchAngle;
}
//寮曞鎸囧悜浜�
@@ -544,7 +553,7 @@
//鑾峰彇浜�
ArdAlarmpointsWell well = ardAlarmpointsWellService.selectArdAlarmpointsWellById(cmd.getWellId());
if (well == null) {
- return AjaxResult.error("浜曚笉瀛樺湪");
+ return AjaxResult.warn("浜曚笉瀛樺湪");
}
GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
@@ -577,17 +586,17 @@
case 1:
if (ardWellGuideCamera.getP1() != null) {
ptzMap = new HashMap<>();
- ptzMap.put("p", ardWellGuideCamera.getP1());
- ptzMap.put("t", ardWellGuideCamera.getT1());
- ptzMap.put("z", ardWellGuideCamera.getZ1());
+ ptzMap.put("p" , ardWellGuideCamera.getP1());
+ ptzMap.put("t" , ardWellGuideCamera.getT1());
+ ptzMap.put("z" , ardWellGuideCamera.getZ1());
}
break;
case 2:
if (ardWellGuideCamera.getP2() != null) {
ptzMap = new HashMap<>();
- ptzMap.put("p", ardWellGuideCamera.getP2());
- ptzMap.put("t", ardWellGuideCamera.getT2());
- ptzMap.put("z", ardWellGuideCamera.getZ2());
+ ptzMap.put("p" , ardWellGuideCamera.getP2());
+ ptzMap.put("t" , ardWellGuideCamera.getT2());
+ ptzMap.put("z" , ardWellGuideCamera.getZ2());
}
break;
@@ -607,17 +616,17 @@
String cameraId = getCameraByNear(new double[]{well.getLongitude(), well.getLatitude()});
cmd.setCameraId(cameraId);
if ("".equals(cameraId)) {
- return AjaxResult.error("鏈壘鍒板紩瀵肩浉鏈�");
+ return AjaxResult.warn("鏈壘鍒板紩瀵肩浉鏈�");
}
//鍒ゆ柇绂佸紩鍖�
if (isInPolygon(cameraId, new Double[]{well.getLongitude(), well.getLatitude()})) {
- return AjaxResult.error("浜曚綅缃睘浜庣浉鏈虹姝㈠紩瀵煎尯鍩�");
+ return AjaxResult.warn("浜曚綅缃睘浜庣浉鏈虹姝㈠紩瀵煎尯鍩�");
}
//鎸変簳鍧愭爣寮�濮嬪紩瀵�
if (!guideTargetPosition(cmd).get("code").equals(200)) {
- return AjaxResult.error("浜曞潗鏍囧紩瀵煎け璐�", "cameraId:" + cameraId);
+ return AjaxResult.warn("浜曞潗鏍囧紩瀵煎け璐�" , "cameraId:" + cameraId);
}
- return AjaxResult.success("浜曞潗鏍囧紩瀵兼垚鍔�", "cameraId:" + cameraId);
+ return AjaxResult.success("浜曞潗鏍囧紩瀵兼垚鍔�" , "cameraId:" + cameraId);
}
@@ -718,7 +727,7 @@
String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
if (ardCameras == null) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
Date now = new Date();
now.setTime(now.getTime() + cmd.getExpired() * 1000);
@@ -741,7 +750,7 @@
String operator = cmd.getOperator();//鐢宠鑰�
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
if (ardCameras == null) {
- return AjaxResult.error("璁惧鏈櫥褰�");
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
if (ardCameras.getOperatorId().equals(operator)) {
//濡傛灉瑙ｉ攣鐩告満鐨勫綋鍓嶇敤鎴锋槸鐢宠鑰咃紝鍒欐竻绌鸿鐩告満鐨勮繃鏈熸椂闂�
@@ -834,13 +843,12 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.getGisInfo(cmd);
- } else {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.getGisInfo(cmd);
} catch (Exception ex) {
log.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鑾峰彇鐩告満鏋惰鍙傛暟寮傚父锛�" + ex.getMessage());
@@ -853,33 +861,30 @@
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.localRecordStart(cmd);
- } else {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localRecordStart(cmd);
} catch (Exception ex) {
log.error("鏈湴褰曞儚寮�濮嬪紓甯革細" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯革細" + ex.getMessage());
}
}
+
//鏈湴褰曞儚鍋滄
@Override
public AjaxResult localRecordStop(CameraCmd cmd) {
try {
String cameraId = cmd.getCameraId();
ArdCameras ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- return cameraSDK.localRecordStop(cmd);
+ if (ardCamera == null) {
+ return AjaxResult.warn("璁惧涓嶅瓨鍦�");
}
- else
- {
- return AjaxResult.error("鐩告満涓嶅瓨鍦�");
- }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.localRecordStop(cmd);
} catch (Exception ex) {
log.error("鏈湴褰曞儚鍋滄寮傚父锛�" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚鍋滄寮傚父锛�" + ex.getMessage());
--
Gitblit v1.9.3