增加引导井关联相机ptz

‘liusuyi’

2024-01-16 8926d27639d8cb9826941b482926f774bd10dc92

 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) {

                        /*控制失败,当前步骤启动时间置null*/

                        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();