Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -2,6 +2,7 @@


import java.util.*;



import com.ruoyi.alarm.global.domain.GuidePoint;

import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;

import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;

import com.ruoyi.common.utils.DateUtils;

@@ -115,7 +116,7 @@
    public int updateArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {

        ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());

        ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());

        //  ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId());

        ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId());

        insertArdVideoInspectTaskStep(ardVideoInspectTask);

        return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);

    }

@@ -183,14 +184,9 @@
        }

        if (StringUtils.isNotNull(ardVideoInspectTaskStepList)) {

            for (ArdVideoInspectTaskStep ardVideoInspectTaskStep : ardVideoInspectTaskStepList) {

                if (ardVideoInspectTaskStep.getId() == null) {

                    //新的步骤,添加

                    ardVideoInspectTaskStep.setId(IdUtils.simpleUUID());

                    ardVideoInspectTaskStepMapper.insertArdVideoInspectTaskStep(ardVideoInspectTaskStep);

                } else {

                    //已有步骤,更新

                    ardVideoInspectTaskStepMapper.updateArdVideoInspectTaskStep(ardVideoInspectTaskStep);

                }

            }

        }

    }

@@ -436,17 +432,13 @@
                if (!StringUtils.isNull(wellId)) {

                    /*获取井坐标*/

                    ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);

                    if(StringUtils.isNull(well))

                    {

                    if (StringUtils.isNull(well)) {

                        log.debug("找不到井:" + well.getWellId());

                        return;

                    }

                    log.debug("找到井:" + well.getWellId());

                    double[] targetPositon = new double[3];

                    targetPositon[0] = well.getLongitude();

                    targetPositon[1] = well.getLatitude();

                    //targetPositon[2] = well.getAltitude();

                    log.debug("找到井坐标:" +well.getLongitude()+"-"+well.getLatitude()+"-"+well.getAltitude());

                    GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());

                    log.debug("找到井坐标:" + well.getLongitude() + "-" + well.getLatitude() + "-" + well.getAltitude());

                    /*获取相机坐标*/

                    ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);

                    if (StringUtils.isNull(cameras)) {

@@ -454,19 +446,14 @@
                        return;

                    }

                    log.debug("找到相机:" + cameraId);

                    //double[] cameraPositon = new double[3];

                    //cameraPositon[0] = cameras.getLongitude();

                    //cameraPositon[1] = cameras.getLatitude();

                    //cameraPositon[2] = cameras.getAltitude();



                    /*控制相机巡检*/

                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(targetPositon);

                    cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime());//秒为单位

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd).get("code").equals(200);

                    if (setTargetPosition) {

                        /*控制相机巡检成功，开始录像*/

                        cameraSdkService.recordStart(cmd);

@@ -502,28 +489,28 @@
                if (!StringUtils.isNull(wellId)) {

                    /*获取井坐标*/

                    ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(wellId);

                    double[] targetPositon = new double[2];

                    targetPositon[0] = well.getLongitude();

                    targetPositon[1] = well.getLatitude();

                    //targetPositon[2] = well.getAltitude();

                    if(StringUtils.isNull(well))

                    {

                        log.debug("找不到井:" + well.getWellId());

                        return;

                    }

                    log.debug("找到井:" + well.getWellId());

                    GuidePoint guidePoint = new GuidePoint().setLongitude(well.getLongitude()).setLatitude(well.getLatitude());

                    /*获取相机坐标*/

                    ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId);

                    if (StringUtils.isNull(cameras)) {

                        log.debug("找不到相机:" + cameraId);

                        return;

                    }

                    double[] cameraPositon = new double[3];

                    cameraPositon[0] = cameras.getLongitude();

                    cameraPositon[1] = cameras.getLatitude();

                    cameraPositon[2] = cameras.getAltitude();

                    log.debug("找到相机:" + cameraId);

                    /*控制相机巡检*/

                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(targetPositon);

                    cmd.setTargetPosition(new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()});

                    cmd.setOperator("sys_patrol_inspect");

                    cmd.setExpired(step.getRecordingTime());//秒为单位

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd);

                    boolean setTargetPosition = cameraSdkService.guideTargetPosition(cmd).get("code").equals(200);

                    if (!setTargetPosition) {

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

                        ardVideoInspectTask.setCurrentStepStartTime("");

@@ -561,7 +548,7 @@
                cmd.setChanNo(channel);

                cmd.setOperator("sys_patrol_inspect");

                cmd.setRecordBucketName("record");

                cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD()+"/"+ IdUtils.fastSimpleUUID());

                cmd.setRecordObjectName("inspectGuide/" + DateUtils.getDateYYYYMMDD() + "/" + IdUtils.fastSimpleUUID());

                String url = cameraSdkService.recordStopToMinio(cmd);

                /*插入巡检记录*/

                ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();

@@ -572,7 +559,7 @@
                    ardVideoInspectRecord.setWellName(ardAlarmpointsWell.getWellId());

                }

                Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);

                Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, step.getRecordingTime());

                Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, step.getRecordingTime());

                ardVideoInspectRecord.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartDate));

                ardVideoInspectRecord.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStopDate));

                ardVideoInspectRecord.setRecordFilePath(url);

@@ -598,7 +585,7 @@
                ArdVideoInspectTaskStep currentStep = objectOptional.get();

                /*获取到当前步骤的开始和结束时间*/

                Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);

                Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, currentStep.getRecordingTime());

                Date currentStepStopDate = DateUtils.addSeconds(currentStepStartDate, currentStep.getRecordingTime());

                /*判断当前步骤时间是否过期*/

                if (!DateUtils.TimeCompare(currentStepStartDate, currentStepStopDate)) {

                    return true;