From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 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 8a93ee5..a35011c 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
@@ -458,6 +458,15 @@
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());
+ data.put("type", ardVideoInspectTask.getInspectMode()+"宸℃");
+ message.put("70000", data);
+ WebSocketUtils.sendMessageAll(message);
+ //endregion
} else {
/*鎺у埗澶辫触,褰撳墠姝ラ鍚姩鏃堕棿缃畁ull*/
ardVideoInspectTask.setCurrentStepStartTime("");
@@ -523,6 +532,7 @@
Map<String, String> data = new HashMap<>();
data.put("cameraId", cmd.getCameraId());
data.put("wellId", well.getWellId());
+ data.put("type", ardVideoInspectTask.getInspectMode()+"宸℃");
message.put("70000", data);
WebSocketUtils.sendMessageAll(message);
//endregion
@@ -661,32 +671,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