From 0771b90c0e49714e1682dc133d1bebafb545dd5a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 02 三月 2024 19:45:12 +0800
Subject: [PATCH] app无人机航线管理提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 41 +++++++----------------------------------
1 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index a17c4b9..ba87d51 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -1073,13 +1073,6 @@
Double longitude = well.getLongitude();
Double latitude = well.getLatitude();
String targetId = ardAlarmRadar.getTargetId();
- GuidePTZ guidePTZ = new GuidePTZ();
- guidePTZ.setP1(well.getGuideP1());
- guidePTZ.setT1(well.getGuideT1());
- guidePTZ.setZ1(well.getGuideZ1());
- guidePTZ.setP2(well.getGuideP2());
- guidePTZ.setT2(well.getGuideT2());
- guidePTZ.setZ2(well.getGuideZ2());
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
@@ -1093,8 +1086,6 @@
ardAlarmRadarMove.setLatitude(latitude);
ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
ardAlarmRadarMove.setRadarId(radarId);
- ardAlarmRadarMove.setGuidePTZ(guidePTZ);
- //
ardAlarmRadarMoveHandler(ardAlarmRadarMove);
break;
case "鐑簮妫�娴�":
@@ -1107,10 +1098,8 @@
ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
ardAlarmRadarFire.setLongitude(longitude);
ardAlarmRadarFire.setLatitude(latitude);
- ardAlarmRadarFire.setGuidePTZ(guidePTZ);
ardAlarmRadarFire.setRadarId(radarId);
ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
- //
ardAlarmRadarFireHandler(ardAlarmRadarFire);
break;
case "闆疯揪鎶芥补鏈哄仠鏈�":
@@ -1125,8 +1114,6 @@
ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
ardAlarmRadarPump.setLongitude(well.getLongitude());
ardAlarmRadarPump.setLatitude(well.getLatitude());
- ardAlarmRadarPump.setGuidePTZ(guidePTZ);
- //
ardAlarmRadarPumpHandler(ardAlarmRadarPump);
break;
}
@@ -1141,16 +1128,10 @@
//澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒ｇ偣鍧愭爣
String defenseName = ardAlarmExternal.getDefenseName();
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
- GuidePTZ guidePTZ = new GuidePTZ();
+
if (StringUtils.isNotNull(well)) {
ardAlarmExternal.setLongitude(well.getLongitude());
ardAlarmExternal.setLatitude(well.getLatitude());
- guidePTZ.setP1(well.getGuideP1());
- guidePTZ.setT1(well.getGuideT1());
- guidePTZ.setZ1(well.getGuideZ1());
- guidePTZ.setP2(well.getGuideP2());
- guidePTZ.setT2(well.getGuideT2());
- guidePTZ.setZ2(well.getGuideZ2());
}
int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
if (aae > 0) {
@@ -1168,7 +1149,7 @@
.setAlarmType("sys_external")
.setReceiveTime(ardAlarmExternal.getCreateTime())
.setTargetPosition(coordinate)
- .setGuidePTZ(guidePTZ);
+ .setWellId(well.getId());
messagesEnqueued(guideDataDto);
}
//endregion
@@ -1269,7 +1250,7 @@
try {
String cameraId = guideDataDto.getCameraId();
if (!IsEnableGuide(cameraId)) {
- log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
+ log.debug("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
return;
}
GuideTask guideTask = new GuideTask();
@@ -1298,10 +1279,7 @@
return;
}
guideTask.setPriority(Integer.valueOf(priority));
- guideTask.setTargetPosition(guideDataDto.getTargetPosition());//鐩爣缁忕含搴�
- if (guideDataDto.getGuidePTZ() != null) {
- guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());//鐩爣PTZ
- }
+ guideTask.setTargetPosition(guideDataDto.getTargetPosition());//寮曞浜旾D
//娑堟伅鍏ラ槦
queueHandler.addTaskToQueue(cameraId, guideTask);
//鎵撳嵃闃熷垪
@@ -1370,7 +1348,6 @@
//鑾峰彇鐩告満寮曞鍏ラ槦
private void getCameraGuideToQueue(GuideDataDto guideDataDto) {
-
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(guideDataDto.getRadarId());
if (StringUtils.isNotNull(cameraWithTower)) {
@@ -1402,8 +1379,7 @@
.setAlarmId(ardAlarmRadarMove.getId())
.setAlarmType(ardAlarmRadarMove.getAlarmType())
.setReceiveTime(ardAlarmRadarMove.getCreateTime())
- .setTargetPosition(coordinate)
- .setGuidePTZ(ardAlarmRadarMove.getGuidePTZ());
+ .setTargetPosition(coordinate);
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
@@ -1426,8 +1402,7 @@
.setAlarmId(ardAlarmRadarFire.getId())
.setAlarmType(ardAlarmRadarFire.getAlarmType())
.setReceiveTime(ardAlarmRadarFire.getCreateTime())
- .setTargetPosition(coordinate)
- .setGuidePTZ(ardAlarmRadarFire.getGuidePTZ());
+ .setTargetPosition(coordinate);
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
@@ -1451,11 +1426,9 @@
.setAlarmId(ardAlarmRadarPump.getId())
.setAlarmType(ardAlarmRadarPump.getAlarmType())
.setReceiveTime(ardAlarmRadarPump.getCreateTime())
- .setTargetPosition(coordinate)
- .setGuidePTZ(ardAlarmRadarPump.getGuidePTZ());
+ .setTargetPosition(coordinate);
getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
-
/**
* 闆疯揪鐩爣绉诲姩鎶ヨ澶勭悊
--
Gitblit v1.9.3