From 7e49fc48065211df6bbb6b6f43fa747cdfbf4727 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 14:48:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 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 fa639b2..8f45372 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
@@ -435,11 +435,11 @@
String wellId = step.getWellId();
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
double[] targetPositon = new double[3];
- targetPositon[0] = ardAlarmpointsWell.getLongitude();
- targetPositon[1] = ardAlarmpointsWell.getLatitude();
- targetPositon[2] = ardAlarmpointsWell.getAltitude();
+ targetPositon[0] = well.getLongitude();
+ targetPositon[1] = well.getLatitude();
+ targetPositon[2] = well.getAltitude();
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -458,9 +458,18 @@
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", ardAlarmpointsWell.getGuideP());
- ptzMap.put("t", ardAlarmpointsWell.getGuideT());
- ptzMap.put("z", ardAlarmpointsWell.getGuideZ());
+ switch (channel) {
+ case 1:
+ ptzMap.put("p", well.getGuideP1());
+ ptzMap.put("t", well.getGuideT1());
+ ptzMap.put("z", well.getGuideZ1());
+ break;
+ case 2:
+ ptzMap.put("p", well.getGuideP2());
+ ptzMap.put("t", well.getGuideT2());
+ ptzMap.put("z", well.getGuideZ2());
+ break;
+ }
cmd.setPtzMap(ptzMap);
boolean setTargetPosition;
if (cmd.getPtzMap().get("p") != null) {
@@ -502,11 +511,11 @@
String wellId = step.getWellId();
if (!StringUtils.isNull(wellId)) {
/*鑾峰彇浜曞潗鏍�*/
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);
double[] targetPositon = new double[3];
- targetPositon[0] = ardAlarmpointsWell.getLongitude();
- targetPositon[1] = ardAlarmpointsWell.getLatitude();
- targetPositon[2] = ardAlarmpointsWell.getAltitude();
+ targetPositon[0] = well.getLongitude();
+ targetPositon[1] = well.getLatitude();
+ targetPositon[2] = well.getAltitude();
/*鑾峰彇鐩告満鍧愭爣*/
ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);
if (StringUtils.isNull(cameras)) {
@@ -525,9 +534,18 @@
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
Map<String, Double> ptzMap = new HashMap<>();
- ptzMap.put("p", ardAlarmpointsWell.getGuideP());
- ptzMap.put("t", ardAlarmpointsWell.getGuideT());
- ptzMap.put("z", ardAlarmpointsWell.getGuideZ());
+ switch (channel) {
+ case 1:
+ ptzMap.put("p", well.getGuideP1());
+ ptzMap.put("t", well.getGuideT1());
+ ptzMap.put("z", well.getGuideZ1());
+ break;
+ case 2:
+ ptzMap.put("p", well.getGuideP2());
+ ptzMap.put("t", well.getGuideT2());
+ ptzMap.put("z", well.getGuideZ2());
+ break;
+ }
cmd.setPtzMap(ptzMap);
boolean setTargetPosition;
if (cmd.getPtzMap().get("p") != null) {
--
Gitblit v1.9.3