三一车辆追踪加入启动即推送提交

zhangnaisong

2024-02-02 b08492fcb6706124bef6e86cd6914c8eba54599a

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

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

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