From 32174535f5cd608c87992a9cdec259a803af63e4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 13 四月 2024 13:35:35 +0800
Subject: [PATCH] 增加视频巡检兴趣点上报
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 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 097c4fa..50701bc 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
@@ -14,6 +14,7 @@
import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskStepMapper;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
@@ -457,6 +458,14 @@
if (setTargetPosition) {
/*鎺у埗鐩告満宸℃鎴愬姛锛屽紑濮嬪綍鍍�*/
cameraSdkService.recordStart(cmd);
+ //region 閫氱煡鍓嶇
+ Map<String, Object> message = new HashMap<>();
+ Map<String, String> data = new HashMap<>();
+ data.put("cameraId", cmd.getCameraId());
+ data.put("wellId", well.getWellId());
+ message.put("70000", data);
+ WebSocketUtils.sendMessageAll(message);
+ //endregion
} else {
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
ardVideoInspectTask.setCurrentStepStartTime("");
@@ -517,6 +526,14 @@
ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
} else {
log.debug("寮曞鎴愬姛!");
+ //region 閫氱煡鍓嶇
+ Map<String, Object> message = new HashMap<>();
+ Map<String, String> data = new HashMap<>();
+ data.put("cameraId", cmd.getCameraId());
+ data.put("wellId", well.getWellId());
+ message.put("70000", data);
+ WebSocketUtils.sendMessageAll(message);
+ //endregion
}
}
}
@@ -652,32 +669,35 @@
public List getCameraIdleTimeList(String cameraId) {
LinkedList<String> timeList = new LinkedList();
List<Map> usedPeriods = this.getTaskUsedCameraPeriods(cameraId);
- for (Map p :
- usedPeriods) {
- timeList.add((String) p.get("start_time"));
- timeList.add((String) p.get("end_time"));
- }
- //鍒ゆ柇绗竴涓捣濮嬬偣
- if (timeList.size() > 0) {
- if ("00:00:00".equals(timeList.getFirst())) {
- timeList.removeFirst();
- } else {
- timeList.addFirst("00:00:00");
+ //浜嬩欢娈典负绌�,鍒欏叏澶╀綔涓轰竴涓椂闂存
+ if (usedPeriods.size() == 0) {
+ timeList.add("00:00:00");
+ timeList.add("23:59:59");
+ }else{
+ for (Map p :
+ usedPeriods) {
+ timeList.add((String) p.get("start_time"));
+ timeList.add((String) p.get("end_time"));
}
- //鍒ゆ柇鏈�鍚庝竴涓粨鏉熸椂闂�
- 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");
- }
+ //鍒ゆ柇绗竴涓捣濮嬬偣
+ 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");
+ }
+
+ }
}
+
return timeList;
}
}
--
Gitblit v1.9.3