zhangjian
2023-08-07 6b009b0f6d3ef3aee97c362cebcd679d1b9088a3
判断列表为空
已修改1个文件
22 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -341,7 +341,9 @@
                                //开始下一步骤
                                videoInspectTask.setCurrentStepId(nextStepId);
                                startRunStep(videoInspectTask);
                            }else{tryGuide(videoInspectTask);}
                            } else {
                                tryGuide(videoInspectTask);
                            }
                        }
                    }
                } else {
@@ -466,6 +468,7 @@
            log.error("巡检开始异常:" + ex.getMessage());
        }
    }
    //尝试控制引导
    private void tryGuide(ArdVideoInspectTask ardVideoInspectTask) {
        try {
@@ -508,9 +511,7 @@
                        /*控制失败,当前步骤启动时间置null*/
                        ardVideoInspectTask.setCurrentStepStartTime("");
                        ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
                    }
                    else
                    {
                    } else {
                        log.debug("引导成功!");
                    }
                }
@@ -519,6 +520,7 @@
            log.error("巡检尝试引导异常:" + ex.getMessage());
        }
    }
    //步骤停止
    private void stopRunStep(ArdVideoInspectTask ardVideoInspectTask) {
        try {
@@ -636,6 +638,11 @@
        return ardVideoInspectTaskMapper.getTaskUsedCameraPeriods(cameraId);
    }
    /**
     * 获取相机的空闲时段
     * @param cameraId
     * @return
     */
    public List getCameraIdleTimeList(String cameraId) {
        LinkedList<String> timeList = new LinkedList();
        List<Map> usedPeriods = this.getTaskUsedCameraPeriods(cameraId);
@@ -645,13 +652,14 @@
            timeList.add((String) p.get("end_time"));
        }
        //判断第一个起始点
        if (timeList.getFirst().equals("00:00:00")) {
        if (timeList.size() > 0) {
            if ("00:00:00".equals(timeList.getFirst())) {
            timeList.removeFirst();
        } else {
            timeList.addFirst("00:00:00");
        }
        //判断最后一个结束时间
        if (timeList.getLast().equals("23:59:59")) {
            if ("23:59:59".equals(timeList.getLast())) {
            timeList.removeLast();
        } else {
            timeList.addLast("23:59:59");
@@ -662,6 +670,8 @@
            timeList.add("23:59:59");
        }
        }
        return timeList;
    }
}