From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 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 9d5fe47..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
@@ -1,9 +1,11 @@
package com.ruoyi.alarm.global.service.impl;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
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;
@@ -23,6 +25,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.ICameraSdkService;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -33,6 +36,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.*;
+
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* @Description: 队列处理器
@@ -87,6 +92,7 @@
}
}
}
+
//异步处理任务
public void processTask(GuideTask guideTask) {
try {
@@ -99,19 +105,44 @@
cmd.setChanNo(guideTask.getChanNo());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
+ Map<String, Double> ptzMap=new HashMap<>();
+ if(guideTask.getTargetPTZ()!=null) {
+ if (guideTask.getChanNo() == 1) {
+ ptzMap.put("p", guideTask.getTargetPTZ().getP1());
+ ptzMap.put("t", guideTask.getTargetPTZ().getT1());
+ ptzMap.put("z", guideTask.getTargetPTZ().getZ1());
+ }
+ if (guideTask.getChanNo() == 2) {
+ ptzMap.put("p", guideTask.getTargetPTZ().getP2());
+ ptzMap.put("t", guideTask.getTargetPTZ().getT2());
+ ptzMap.put("z", guideTask.getTargetPTZ().getZ2());
+ }
+ cmd.setPtzMap(ptzMap);
+ }
cmd.setRecordBucketName("record");
- cmd.setTargetPosition(guideTask.getTargetPosition());
- cmd.setRecordObjectName("alarmGuide/"+ DateUtils.getDateYYYYMMDD()+"/"+guideTask.getAlarmType()+"/"+guideTask.getAlarmId());
+ 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("开始引导");
boolean recordFlag = false;
- boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
+ boolean guideRes = false;
+ if (guideTask.getIsGuidePTZ()) {
+ AjaxResult result = cameraSdkService.setPtz(cmd);
+ if (result.get("code").equals(200)) {
+ guideRes = true;
+ }
+ } else {
+ AjaxResult result = cameraSdkService.guideTargetPosition(cmd);
+ guideRes = result.get("code").equals(200);
+ }
if (guideRes) {
log.debug("引导成功");
cameraSdkService.controlLock(cmd);//上锁
cameraSdkService.recordStart(cmd);//开始录像
recordFlag = true;
Instant startTime = Instant.now();
+ Instant startTime1 = startTime;
while (recordFlag) {
//判断时间
Instant currentTime = Instant.now();
@@ -131,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