From 64a30dbd08914a5f68c136769bb79f2372b2c06d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 四月 2024 16:45:55 +0800
Subject: [PATCH] 视频标签修改提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
index 484f0b7..3ffd02d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java
@@ -5,6 +5,7 @@
import com.ruoyi.alarm.access.service.IArdAlarmAccessService;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
+import com.ruoyi.alarm.global.domain.GuidePoint;
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
@@ -119,7 +120,8 @@
cmd.setPtzMap(ptzMap);
}
cmd.setRecordBucketName("record");
- cmd.setTargetPosition(guideTask.getTargetPosition());
+ GuidePoint targetPosition = guideTask.getTargetPosition();
+ cmd.setTargetPosition(new double[]{targetPosition.getLongitude(),targetPosition.getLatitude()});
cmd.setRecordObjectName("alarmGuide/" + DateUtils.getDateYYYYMMDD() + "/" + guideTask.getAlarmType() + "/" + guideTask.getAlarmId());
ICameraSdkService cameraSdkService = SpringUtils.getBean(ICameraSdkService.class);
log.debug("寮�濮嬪紩瀵�");
@@ -131,25 +133,16 @@
guideRes = true;
}
} else {
- guideRes = cameraSdkService.guideTargetPosition(cmd);
+ AjaxResult result = cameraSdkService.guideTargetPosition(cmd);
+ guideRes = result.get("code").equals(200);
}
if (guideRes) {
log.debug("寮曞鎴愬姛");
- //region 閫氱煡鍓嶇
- Map<String, Object> message = new HashMap<>();
- Map<String, String> data = new HashMap<>();
- data.put("cameraId", cmd.getCameraId());
- data.put("chanNo", cmd.getChanNo().toString());
- data.put("alarmType", cmd.getOperator());
- data.put("alarmId", guideTask.getAlarmId());
- data.put("wellId", guideTask.getWellId());
- message.put("70000", data);
- WebSocketUtils.sendMessageAll(message);
- //endregion
cameraSdkService.controlLock(cmd);//涓婇攣
cameraSdkService.recordStart(cmd);//寮�濮嬪綍鍍�
recordFlag = true;
Instant startTime = Instant.now();
+ Instant startTime1 = startTime;
while (recordFlag) {
//鍒ゆ柇鏃堕棿
Instant currentTime = Instant.now();
@@ -169,6 +162,27 @@
recordFlag = false;//褰曞儚鍋滄
}
}
+ //region 閫氱煡鍓嶇
+ long seconds = Duration.between(startTime1, currentTime).getSeconds();
+ // 鍒ゆ柇褰撳墠鏃堕棿涓庝笂娆″彂閫佹暟鎹殑鏃堕棿闂撮殧鏄惁瓒呰繃2绉�
+ if (seconds == 2) {
+ Map<String, Object> message = new HashMap<>();
+ Map<String, String> data = new HashMap<>();
+ data.put("cameraId", cmd.getCameraId());
+ data.put("wellId", guideTask.getWellId());
+ switch (guideTask.getAlarmType())
+ {
+ case "sys_radar_move":data.put("type", "闆疯揪绉诲姩鎶ヨ");break;
+ case "sys_radar_fire":data.put("type", "绾㈠闃茬伀鎶ヨ");break;
+ case "sys_radar_pump":data.put("type", "鎶芥补鏈哄仠鏈烘姤璀�");break;
+ default:data.put("type", "闆疯揪鎶ヨ");break;
+ }
+
+ message.put("70000", data);
+ WebSocketUtils.sendMessageAll(message);
+ startTime1 = currentTime; // 鏇存柊涓婃鍙戦�佹暟鎹殑鏃堕棿鎴�
+ }
+ //endregion
}
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
--
Gitblit v1.9.3