From 68fef8087e98279fcfe9511cdeba87163061091b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 16 三月 2024 11:14:11 +0800
Subject: [PATCH] 指挥端位置查询bug修改提交
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
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 890016e..9312614 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
@@ -2,6 +2,7 @@
import java.util.*;
+import com.ruoyi.alarm.global.domain.GuidePoint;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.common.utils.DateUtils;
@@ -436,17 +437,13 @@
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
- if(StringUtils.isNull(well))
- {
+ if (StringUtils.isNull(well)) {
log.debug("鎵句笉鍒颁簳:" + well.getWellId());
return;
}
log.debug("鎵惧埌浜�:" + well.getWellId());
- double[] targetPositon = new double[3];
- targetPositon[0] = well.getLongitude();
- targetPositon[1] = well.getLatitude();
- //targetPositon[2] = well.getAltitude();
- log.debug("鎵惧埌浜曞潗鏍�:" +well.getLongitude()+"-"+well.getLatitude()+"-"+well.getAltitude());
+ GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
+ log.debug("鎵惧埌浜曞潗鏍�:" + well.getLongitude() + "-" + well.getLatitude() + "-" + well.getAltitude());
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -454,19 +451,14 @@
return;
}
log.debug("鎵惧埌鐩告満:" + cameraId);
- //double[] cameraPositon = new double[3];
- //cameraPositon[0] = cameras.getLongitude();
- //cameraPositon[1] = cameras.getLatitude();
- //cameraPositon[2] = cameras.getAltitude();
-
/*鎺у埗鐩告満宸℃*/
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(cameraId);
cmd.setChanNo(channel);
- cmd.setTargetPosition(targetPositon);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
- boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
+ boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd).get("code").equals(200);
if (setTargetPosition) {
/*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
cameraSdkService.recordStart(cmd);
@@ -502,28 +494,28 @@
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
- double[] targetPositon = new double[2];
- targetPositon[0] = well.getLongitude();
- targetPositon[1] = well.getLatitude();
- //targetPositon[2] = well.getAltitude();
+ if(StringUtils.isNull(well))
+ {
+ log.debug("鎵句笉鍒颁簳:" + well.getWellId());
+ return;
+ }
+ log.debug("鎵惧埌浜�:" + well.getWellId());
+ GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
log.debug("鎵句笉鍒扮浉鏈�:" + cameraId);
return;
}
- double[] cameraPositon = new double[3];
- cameraPositon[0] = cameras.getLongitude();
- cameraPositon[1] = cameras.getLatitude();
- cameraPositon[2] = cameras.getAltitude();
+ log.debug("鎵惧埌鐩告満:" + cameraId);
/*鎺у埗鐩告満宸℃*/
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(cameraId);
cmd.setChanNo(channel);
- cmd.setTargetPosition(targetPositon);
+ cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime());//绉掍负鍗曚綅
- boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
+ boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd).get("code").equals(200);
if (!setTargetPosition) {
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
ardVideoInspectTask.setCurrentStepStartTime("");
@@ -561,7 +553,7 @@
cmd.setChanNo(channel);
cmd.setOperator("sys_patrol_inspect");
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD()+"/"+ IdUtils.fastSimpleUUID());
+ cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD() + "/" + IdUtils.fastSimpleUUID());
String url = cameraSdkService.recordStopToMinio(cmd);
/*鎻掑叆宸℃璁板綍*/
ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
--
Gitblit v1.9.3