From 8926d27639d8cb9826941b482926f774bd10dc92 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 16 一月 2024 17:28:48 +0800
Subject: [PATCH] 增加引导井关联相机ptz
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 45 ++++-----------------------------------------
1 files changed, 4 insertions(+), 41 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 8f45372..1c4cb8b 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
@@ -457,26 +457,8 @@
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
- Map<String, Double> ptzMap = new HashMap<>();
- 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) {
- setTargetPosition = cameraSdkService.setPtz(cmd);
- } else {
- setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
- }
+
+ boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
if (setTargetPosition) {
/*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
cameraSdkService.recordStart(cmd);
@@ -533,26 +515,7 @@
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
cmd.setExpired(step.getRecordingTime() * 60);
- Map<String, Double> ptzMap = new HashMap<>();
- 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) {
- setTargetPosition = cameraSdkService.setPtz(cmd);
- } else {
- setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
- }
+ boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);
if (!setTargetPosition) {
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
ardVideoInspectTask.setCurrentStepStartTime("");
@@ -590,7 +553,7 @@
cmd.setChanNo(channel);
cmd.setOperator("sys_patrol_inspect");
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("inspect_" + IdUtils.fastSimpleUUID());
+ cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD()+"/"+ IdUtils.fastSimpleUUID());
String url = cameraSdkService.recordStopToMinio(cmd);
/*鎻掑叆宸℃璁板綍*/
ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
--
Gitblit v1.9.3