From 6b009b0f6d3ef3aee97c362cebcd679d1b9088a3 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: Mon, 07 Aug 2023 17:34:08 +0800
Subject: [PATCH] 判断列表为空
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 4c32163..a13a827 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -230,7 +230,7 @@
//开始下一步骤
videoInspectTask.setCurrentStepId(nextStepId);
startRunStep(videoInspectTask);
- }else{
+ } else {
//未过期尝试引导，引导失败清空当前步骤开始时间，标记中断
tryGuide(videoInspectTask);
}
@@ -341,7 +341,9 @@
//开始下一步骤
videoInspectTask.setCurrentStepId(nextStepId);
startRunStep(videoInspectTask);
- }else{tryGuide(videoInspectTask);}
+ } else {
+ tryGuide(videoInspectTask);
+ }
}
}
} else {
@@ -450,7 +452,7 @@
cmd.setChannelNum(channel);
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
- cmd.setExpired(step.getRecordingTime()*60);
+ cmd.setExpired(step.getRecordingTime() * 60);
boolean setTargetPosition = hikClientService.guideTargetPosition(cmd);
if (setTargetPosition) {
/*控制相机巡检成功，开始录像*/
@@ -466,6 +468,7 @@
log.error("巡检开始异常：" + ex.getMessage());
}
}
+
//尝试控制引导
private void tryGuide(ArdVideoInspectTask ardVideoInspectTask) {
try {
@@ -502,15 +505,13 @@
cmd.setChannelNum(channel);
cmd.setTargetPosition(targetPositon);
cmd.setOperator("sys_patrol_inspect");
- cmd.setExpired(step.getRecordingTime()*60);
+ cmd.setExpired(step.getRecordingTime() * 60);
boolean setTargetPosition = hikClientService.guideTargetPosition(cmd);
if (!setTargetPosition) {
/*控制失败,当前步骤启动时间置null*/
ardVideoInspectTask.setCurrentStepStartTime("");
ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
- }
- else
- {
+ } else {
log.debug("引导成功!");
}
}
@@ -519,6 +520,7 @@
log.error("巡检尝试引导异常：" + ex.getMessage());
}
}
+
//步骤停止
private void stopRunStep(ArdVideoInspectTask ardVideoInspectTask) {
try {
@@ -542,8 +544,8 @@
cmd.setChannelNum(channel);
cmd.setOperator("sys_patrol_inspect");
cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("inspect_"+ IdUtils.fastSimpleUUID());
- String url= hikClientService.recordStopToMinio(cmd);
+ cmd.setRecordObjectName("inspect_" + IdUtils.fastSimpleUUID());
+ String url = hikClientService.recordStopToMinio(cmd);
/*插入巡检记录*/
ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
ardVideoInspectRecord.setStepId(step.getId());
@@ -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,21 +652,24 @@
timeList.add((String) p.get("end_time"));
}
//判断第一个起始点
- if (timeList.getFirst().equals("00:00:00")) {
- timeList.removeFirst();
- } else {
- timeList.addFirst("00:00:00");
- }
- //判断最后一个结束时间
- if (timeList.getLast().equals("23:59:59")) {
- timeList.removeLast();
- } else {
- timeList.addLast("23:59:59");
- }
- //事件段为空,则全天作为一个时间段
- if (timeList.size() == 0) {
- timeList.add("00:00:00");
- timeList.add("23:59:59");
+ if (timeList.size() > 0) {
+ if ("00:00:00".equals(timeList.getFirst())) {
+ timeList.removeFirst();
+ } else {
+ timeList.addFirst("00:00:00");
+ }
+ //判断最后一个结束时间
+ if ("23:59:59".equals(timeList.getLast())) {
+ timeList.removeLast();
+ } else {
+ timeList.addLast("23:59:59");
+ }
+ //事件段为空,则全天作为一个时间段
+ if (timeList.size() == 0) {
+ timeList.add("00:00:00");
+ timeList.add("23:59:59");
+ }
+
}
return timeList;
--
Gitblit v1.9.3