From 34980c0735ab4102130022941535d17d2f5771bb Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 27 三月 2024 13:35:35 +0800
Subject: [PATCH] 雷达在线
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 afa6338..05ebddc 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;
@@ -91,6 +92,7 @@
}
}
}
+
//寮傛澶勭悊浠诲姟
public void processTask(GuideTask guideTask) {
try {
@@ -103,24 +105,48 @@
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("寮曞鎴愬姛");
//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());
+ 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);
+ data.put("wellId", guideTask.getWellId());
+ message.put("70000", data);
WebSocketUtils.sendMessageAll(message);
//endregion
cameraSdkService.controlLock(cmd);//涓婇攣
--
Gitblit v1.9.3