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 | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 42 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 1ca7cc7..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;
@@ -15,12 +17,15 @@
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
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;
@@ -31,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: 队列处理器
@@ -58,25 +65,6 @@
}
log.debug("新任务入队:" + task.getAlarmId());
guideTaskQueue.add(task);
- /*获取该相机的当前执行线程-----弃用*/
- //TaskThread currentTaskThread = threadMap.get(cameraId);
- ////如果队列当前线程正在运行，若入队任务优先级大于当前任务优先级，则终止当前线程
- //if (currentTaskThread != null){
- // if (task.getPriority() > currentTaskThread.getCurrentTask().getPriority()) {
- // currentTaskThread.getThread().interrupt();
- // }
- // if (!currentTaskThread.getThread().isAlive()) {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- // }
- //}
- ////如果队列当前没有线程正在运行，则启动新线程
- //else {
- // Thread newThread = createThread(cameraId, guideTaskQueue);
- // threadMap.put(cameraId, new TaskThread(newThread, task));
- // newThread.start();
- //}
}
@Async("guideExecutor")
@@ -94,7 +82,7 @@
}
log.debug("执行新任务:【" + newTask.getAlarmId() + "】");
log.debug("剩余任务数:【" + guideTasks.size() + "】");
- // 异步处理任务，并获取Future
+ // 处理任务
processTask(newTask);
}
try {
@@ -105,6 +93,7 @@
}
}
+ //异步处理任务
public void processTask(GuideTask guideTask) {
try {
if (!IsEnableGuide(guideTask.getCameraId())) {
@@ -114,34 +103,38 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
cmd.setChanNo(guideTask.getChanNo());
- cmd.setTargetPosition(guideTask.getTargetPosition());
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
- cmd.setRecordBucketName("record");
- Map<String, Double> ptzMap = new HashMap<>();
- switch (guideTask.getChanNo()) {
- case 1:
- ptzMap.put("p", guideTask.getGuidePTZ().getP1());
- ptzMap.put("t", guideTask.getGuidePTZ().getT1());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ1());
- break;
- case 2:
- ptzMap.put("p", guideTask.getGuidePTZ().getP2());
- ptzMap.put("t", guideTask.getGuidePTZ().getT2());
- ptzMap.put("z", guideTask.getGuidePTZ().getZ2());
- break;
+ 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.setPtzMap(ptzMap);
- cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
+ cmd.setRecordBucketName("record");
+ 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 guideRes = false;
boolean recordFlag = false;
- if (cmd.getPtzMap().get("p") != null) {
- //p值存在 优先引导ptz
- guideRes = cameraSdkService.setPtz(cmd);
+ boolean guideRes = false;
+ if (guideTask.getIsGuidePTZ()) {
+ AjaxResult result = cameraSdkService.setPtz(cmd);
+ if (result.get("code").equals(200)) {
+ guideRes = true;
+ }
} else {
- guideRes = cameraSdkService.guideTargetPosition(cmd);
+ AjaxResult result = cameraSdkService.guideTargetPosition(cmd);
+ guideRes = result.get("code").equals(200);
}
if (guideRes) {
log.debug("引导成功");
@@ -149,6 +142,7 @@
cameraSdkService.recordStart(cmd);//开始录像
recordFlag = true;
Instant startTime = Instant.now();
+ Instant startTime1 = startTime;
while (recordFlag) {
//判断时间
Instant currentTime = Instant.now();
@@ -168,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()) {
@@ -236,4 +251,4 @@
}
return enabled;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3