解决手动巡检启动2次的问题

liusuyi

2023-06-03 4a9566ba1c800535504462b06a93b1a6e5092f28

解决手动巡检启动2次的问题

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

@@ -115,7 +115,7 @@
        ardVideoInspectTask.setUpdateBy(SecurityUtils.getUsername());
        ardVideoInspectTask.setUpdateTime(DateUtils.getNowDate());
        //  ardVideoInspectTaskMapper.deleteArdVideoInspectTaskStepByTaskId(ardVideoInspectTask.getId());
        insertArdVideoInspectTaskStep(ardVideoInspectTask);
       // insertArdVideoInspectTaskStep(ardVideoInspectTask);
        return ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
    }

@@ -193,6 +193,10 @@
    public void manualTaskRun(String TaskId) {
        try {
            ArdVideoInspectTask videoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(TaskId);
            if(!videoInspectTask.getMenualSwitch().equals("开"))
            {
                return;
            }
            if (videoInspectTask.getArdVideoInspectTaskStepList().size() == 0) {
                return;
            }
@@ -425,6 +429,10 @@
                    .findFirst();
            if (objectOptional.isPresent()) {
                ArdVideoInspectTaskStep step = objectOptional.get();
                /*更新任务当前步骤id和步骤启动时间*/
                ardVideoInspectTask.setCurrentStepId(step.getId());
                ardVideoInspectTask.setCurrentStepStartTime(DateUtils.getTime());
                ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
                String wellId = step.getWellId();
                if (!StringUtils.isNull(wellId)) {
                    /*获取井坐标*/
@@ -456,10 +464,6 @@
                            hikClientService.recordToMinio(cmd);
                            Global.task_record.add(ardVideoInspectTask.getId());
                        }
                        /*更新任务当前步骤id和步骤启动时间*/
                        ardVideoInspectTask.setCurrentStepId(step.getId());
                        ardVideoInspectTask.setCurrentStepStartTime(DateUtils.getTime());
                        ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
                    } else {
                        cmd.setEnable(false);//停止录像
                        cmd.setUploadMinio(true);
@@ -520,7 +524,6 @@
            log.error("巡检停止异常:" + ex.getMessage());
        }
    }

    //步骤判断是否过期
    private boolean isExpirdStep(ArdVideoInspectTask ardVideoInspectTask) {
        try {
@@ -551,7 +554,6 @@
            return false;
        }
    }

    //步骤切换
    private String changeNextStep(ArdVideoInspectTask ardVideoInspectTask) {
        try {