From 7dfd5f52332212d2f2c111cc11147469a68b7bdb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 11 三月 2024 17:23:34 +0800
Subject: [PATCH] 取消坐标数组改为实体类
---
ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java | 2 +-
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 2 +-
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 2 +-
ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 2 +-
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 4 +++-
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 4 ++--
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 5 ++---
ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java | 4 ++--
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 2 +-
9 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
index 484f0b7..7cfafa5 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -5,6 +5,7 @@
import com.ruoyi.alarm.access.service.IArdAlarmAccessService;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
+import com.ruoyi.alarm.global.domain.GuidePoint;
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
@@ -119,7 +120,8 @@
cmd.setPtzMap(ptzMap);
}
cmd.setRecordBucketName("record");
- cmd.setTargetPosition(guideTask.getTargetPosition());
+ GuidePoint targetPosition = guideTask.getTargetPosition();
+ cmd.setTargetPosition(new double[]{targetPosition.getLongitude(),targetPosition.getLatitude()});
cmd.setRecordObjectName("alarmGuide/" + DateUtils.getDateYYYYMMDD() + "/" + guideTask.getAlarmType() + "/" + guideTask.getAlarmId());
ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
log.debug("寮�濮嬪紩瀵�");
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
index e211410..c81b343 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/service/impl/ArdRadarServiceImpl.java
@@ -109,7 +109,7 @@
cmd.setOperator("sys_radar_follow");
cmd.setCameraId(camera.getId());
cmd.setChanNo(1);
- cmd.setTargetPosition(guidePoint);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
boolean res = iCameraSdkService.guideTargetPosition(cmd);
if (res) {
log.debug("闆疯揪杩借釜寮曞鎴愬姛");
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java
index 147b230..fe446ef 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java
@@ -194,8 +194,8 @@
point.setLatitude(Double.valueOf(parts[i + 1]));
pointList.add(point);
}
- double lon = cmd.getTargetPosition().getLongitude();
- double lat = cmd.getTargetPosition().getLatitude();
+ double lon = cmd.getTargetPosition()[0];
+ double lat = cmd.getTargetPosition()[1];
Point targetPoint = new Point(lon, lat);
//鍒ゆ柇寮曞鐩爣鏄惁鍦ㄥ潗鏍囬泦鍚堢粍鎴愮殑澶氳竟褰㈠唴
boolean inPolygon = GisUtil.isInPolygon(targetPoint, pointList);
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
index c5f2143..0469bff 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
@@ -38,7 +38,7 @@
Map<String, Double> ptzMap;
/*鐩爣缁忕含搴�*/
- GuidePoint targetPosition;
+ double[] targetPosition;
/*鐩爣浜�*/
String wellId;
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index be6a3b9..cfb7b29 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -403,8 +403,8 @@
@Override
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
try {
- GuidePoint guidePoint = cmd.getTargetPosition();
- if (guidePoint == null) {
+ double[] targetPosition = cmd.getTargetPosition();
+ if (targetPosition == null) {
log.debug("鐩爣浣嶇疆涓虹┖");
return new TreeMap<>();
}
@@ -419,7 +419,6 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double[] targetPosition = new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()};
double distance = GisUtil.getDistance(targetPosition, camPosition);
if (camera.getCamMaxVisibleDistance() == null) {
continue;
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 d698a32..6869b82 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
@@ -502,7 +502,7 @@
return AjaxResult.error("浜曚笉瀛樺湪");
}
GuidePoint guidePoint=new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
- cmd.setTargetPosition(guidePoint);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(),guidePoint.getLatitude()});
//鑾峰彇浜曢厤缃殑寮曞鐩告満鍒楄〃
List<ArdWellGuideCamera> ardWellGuideCameraList = well.getArdWellGuideCameraList();
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index f14a2b1..482cbf0 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -455,7 +455,7 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(cameraId);
cmd.setChanNo(channel);
- cmd.setTargetPosition(guidePoint);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
@@ -512,7 +512,7 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(cameraId);
cmd.setChanNo(channel);
- cmd.setTargetPosition(guidePoint);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
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 b7810a5..29ef39c 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
@@ -690,7 +690,7 @@
try {
ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
- double[] targetPositions = new double[]{cmd.getTargetPosition().getLongitude(),cmd.getTargetPosition().getLatitude()};
+ double[] targetPositions = cmd.getTargetPosition();
double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
int p = (int) (cameraPTZ[0] * 10);
int t = (int) (cameraPTZ[1] * 10);
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 27f62d1..2e09f50 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
@@ -1104,7 +1104,7 @@
try {
ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
- double[] targetPositions = new double[]{cmd.getTargetPosition().getLongitude(), cmd.getTargetPosition().getLatitude()};
+ 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));
--
Gitblit v1.9.3