From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期五, 26 一月 2024 15:13:43 +0800 Subject: [PATCH] 单兵端查看已通过的申请提交 --- ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 43 ++++++++++++------------------------------- 1 files changed, 12 insertions(+), 31 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..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 @@ -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)) { @@ -457,17 +457,8 @@ cmd.setTargetPosition(targetPositon); 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()); - 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); @@ -502,11 +493,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)) { @@ -524,17 +515,7 @@ cmd.setTargetPosition(targetPositon); 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()); - 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(""); @@ -572,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