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

@@ -116,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);

    }

@@ -184,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);

                }

            }

        }

    }

@@ -455,10 +450,10 @@
                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(guidePoint);

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

@@ -512,10 +507,10 @@
                    CameraCmd cmd = new CameraCmd();

                    cmd.setCameraId(cameraId);

                    cmd.setChanNo(channel);

                    cmd.setTargetPosition(guidePoint);

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