From 6b4a4baa1048b1ed148580802ab06a78bbbd3db7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 09 十二月 2023 14:14:11 +0800
Subject: [PATCH] 报警引导增加优先井配置ptz引导
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 214 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 141 insertions(+), 73 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 1d710a9..588c3f5 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
@@ -11,10 +11,7 @@
import com.ruoyi.alarm.digitization3.mapper.ArdAlarmDigitization3Mapper;
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
-import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
-import com.ruoyi.alarm.global.domain.GlobalAlarmData;
-import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.global.domain.GuideTask;
+import com.ruoyi.alarm.global.domain.*;
import com.ruoyi.alarm.global.service.IGlobalAlarmService;
import com.ruoyi.alarm.radar.domain.*;
import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
@@ -35,13 +32,11 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ConfigUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.external.domain.ArdEquipExternal;
import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
@@ -54,14 +49,12 @@
import com.ruoyi.utils.tube.GeoPoint;
import com.ruoyi.utils.tube.TubeTools;
import lombok.extern.slf4j.Slf4j;
-import org.gavaghan.geodesy.GlobalCoordinates;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -73,7 +66,7 @@
* @Version: 1.0
**/
@Service
-@Slf4j(topic = "mqtt")
+@Slf4j(topic = "alarm")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
//region 渚濊禆娉ㄥ叆
@Resource
@@ -1039,9 +1032,17 @@
return;
}
double[] coordinate = new double[]{longitude, latitude};
- String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
- if (StringUtils.isNotEmpty(nearbyCameraId)) {
- messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getCreateTime(), 1, 1, coordinate);
+ String cameraId = getCameraByNear(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if (StringUtils.isNotEmpty(cameraId)) {
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setAlarmId(cameraId)
+ .setAlarmId(ardAlarmTube.getId())
+ .setAlarmType("sys_tube_leak")
+ .setReceiveTime(ardAlarmTube.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate);
+ messagesEnqueued(guideDataDto);
}
//endregion
}
@@ -1061,7 +1062,7 @@
case "radar":
//region 澶勭悊闆疯揪鎶ヨ
String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
- Integer radarMergeTime= mergeTime==null||"".equals(mergeTime)?10:Integer.valueOf(mergeTime);
+ Integer radarMergeTime = mergeTime == null || "".equals(mergeTime) ? 10 : Integer.valueOf(mergeTime);
RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
@@ -1069,13 +1070,16 @@
String radarId = radarAlarmData.getRadarId();
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
- if(well==null)
- {
+ if (well == null) {
return;
}
+ Double guideP = well.getGuideP();
+ Double guideT = well.getGuideT();
+ Double guideZ = well.getGuideZ();
Double longitude = well.getLongitude();
Double latitude = well.getLatitude();
String targetId = ardAlarmRadar.getTargetId();
+ GuidePTZ guidePTZ = new GuidePTZ();
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
@@ -1089,6 +1093,11 @@
ardAlarmRadarMove.setLatitude(latitude);
ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
ardAlarmRadarMove.setRadarId(radarId);
+
+ guidePTZ.setP(guideP);
+ guidePTZ.setT(guideT);
+ guidePTZ.setZ(guideZ);
+ ardAlarmRadarMove.setGuidePTZ(guidePTZ);
Date alarmTime = ardAlarmRadarMove.getAlarmTime();
//鑾峰彇褰撳墠鍏磋叮鐐瑰綋鍓嶉浄杈剧殑涓婁竴鏉℃暟鎹�
ArdAlarmRadarMove lastMoveData = ardAlarmRadarMoveMapper.selectArdAlarmRadarLastData(ardAlarmRadarMove.getName());
@@ -1101,7 +1110,7 @@
//鍚﹀垯姣斿鏇存柊鏃堕棿
Date lastUpdateTime = lastMoveData.getUpdateTime();
Date lastGuideTime = lastMoveData.getGuideTime();
- long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
if (secDatePoor <= radarMergeTime) {
//灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
ArdAlarmRadarMove updateData = new ArdAlarmRadarMove();
@@ -1109,9 +1118,8 @@
updateData.setUpdateTime(alarmTime);
//鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
- long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime,lastGuideTime);
- if(secDatePoorGuide>=300)
- {
+ long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+ if (secDatePoorGuide >= 300) {
updateData.setGuideTime(alarmTime);
radarMoveGuide(ardAlarmRadarMove);//寮曞
}
@@ -1142,6 +1150,10 @@
ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
ardAlarmRadarFire.setLongitude(longitude);
ardAlarmRadarFire.setLatitude(latitude);
+ guidePTZ.setP(guideP);
+ guidePTZ.setT(guideT);
+ guidePTZ.setZ(guideZ);
+ ardAlarmRadarFire.setGuidePTZ(guidePTZ);
ardAlarmRadarFire.setRadarId(radarId);
ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
//
@@ -1155,9 +1167,8 @@
} else {
//鍚﹀垯姣斿鏇存柊鏃堕棿
Date lastUpdateTime = lastFireData.getUpdateTime();
-
Date lastGuideTime = lastFireData.getGuideTime();
- long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
if (secDatePoor <= radarMergeTime) {
//灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
ArdAlarmRadarFire updateData = new ArdAlarmRadarFire();
@@ -1165,9 +1176,8 @@
updateData.setUpdateTime(alarmTime);
//鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
- long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime,lastGuideTime);
- if(secDatePoorGuide>=300)
- {
+ long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+ if (secDatePoorGuide >= 300) {
updateData.setGuideTime(alarmTime);
radarFireGuide(ardAlarmRadarFire);//寮曞
}
@@ -1191,11 +1201,12 @@
ardAlarmRadarPump.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
alarmTime = ardAlarmRadarPump.getAlarmTime();
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
- if (StringUtils.isNotNull(ardAlarmpointsWell)) {
- ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
- ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
- }
+ ardAlarmRadarPump.setLongitude(well.getLongitude());
+ ardAlarmRadarPump.setLatitude(well.getLatitude());
+ guidePTZ.setP(guideP);
+ guidePTZ.setT(guideT);
+ guidePTZ.setZ(guideZ);
+ ardAlarmRadarPump.setGuidePTZ(guidePTZ);
//
ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
if (lastPumpData == null) {
@@ -1207,16 +1218,15 @@
//鍚﹀垯姣斿鏇存柊鏃堕棿
Date lastUpdateTime = lastPumpData.getUpdateTime();
Date lastGuideTime = lastPumpData.getGuideTime();
- long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
+ long secDatePoor = DateUtils.getSecDatePoor(alarmTime, lastUpdateTime);
if (secDatePoor <= radarMergeTime) {
//灏忎簬10绉掔殑鏂版暟鎹紝鏇存柊涓婁竴鏉�
ArdAlarmRadarPump updateData = new ArdAlarmRadarPump();
updateData.setId(lastPumpData.getId());
updateData.setUpdateTime(alarmTime);
//鍒ゆ柇寮曞鏃堕棿瓒呰繃5鍒嗛挓鍐嶆寮曞
- long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime,lastGuideTime);
- if(secDatePoorGuide>=300)
- {
+ long secDatePoorGuide = DateUtils.getSecDatePoor(alarmTime, lastGuideTime);
+ if (secDatePoorGuide >= 300) {
radarPumpGuide(ardAlarmRadarPump);//寮曞
updateData.setGuideTime(alarmTime);
}
@@ -1240,10 +1250,10 @@
ardAlarmExternal.setCreateTime(new Date());//鎺ユ敹鏃堕棿
//澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒ｇ偣鍧愭爣
String defenseName = ardAlarmExternal.getDefenseName();
- ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
- if (StringUtils.isNotNull(ardAlarmpointsWell)) {
- ardAlarmExternal.setLongitude(ardAlarmpointsWell.getLongitude());
- ardAlarmExternal.setLatitude(ardAlarmpointsWell.getLatitude());
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
+ if (StringUtils.isNotNull(well)) {
+ ardAlarmExternal.setLongitude(well.getLongitude());
+ ardAlarmExternal.setLatitude(well.getLatitude());
}
int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
if (aae > 0) {
@@ -1252,10 +1262,23 @@
if (StringUtils.isNull(ardAlarmExternal.getLongitude()) || StringUtils.isNull(ardAlarmExternal.getLatitude())) {
return;
}
- double[] guideCoordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//寮曞鍧愭爣
- String nearbyCameraId = getNearbyCamera(guideCoordinate);//鏈�杩戠浉鏈篒D
- if (StringUtils.isNotEmpty(nearbyCameraId)) {
- messagesEnqueued(nearbyCameraId, ardAlarmExternal.getId(), "sys_external", ardAlarmExternal.getCreateTime(), 1, 1, guideCoordinate);
+ double[] coordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//寮曞鍧愭爣
+ GuidePTZ guidePTZ = new GuidePTZ()
+ .setP(well.getGuideP())
+ .setT(well.getGuideT())
+ .setZ(well.getGuideZ());
+ String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
+ if (StringUtils.isNotEmpty(cameraId)) {
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setAlarmId(cameraId)
+ .setAlarmId(ardAlarmExternal.getId())
+ .setAlarmType("sys_external")
+ .setReceiveTime(ardAlarmExternal.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate)
+ .setGuidePTZ(guidePTZ);
+ messagesEnqueued(guideDataDto);
}
//endregion
}
@@ -1283,10 +1306,18 @@
if (StringUtils.isNull(ardAlarmAccess.getLongitude()) || StringUtils.isNull(ardAlarmAccess.getLatitude())) {
return;
}
- double[] guideCoordinate = new double[]{ardAlarmAccess.getLongitude(), ardAlarmAccess.getLatitude()};//寮曞鍧愭爣
- String nearbyCameraId = getNearbyCamera(guideCoordinate);//鏈�杩戠浉鏈篒D
- if (StringUtils.isNotEmpty(nearbyCameraId)) {
- messagesEnqueued(nearbyCameraId, ardAlarmAccess.getId(), "sys_access_control", ardAlarmAccess.getCreateTime(), 1, 1, guideCoordinate);
+ double[] coordinate = new double[]{ardAlarmAccess.getLongitude(), ardAlarmAccess.getLatitude()};//寮曞鍧愭爣
+ String cameraId = getCameraByNear(coordinate);//鏈�杩戠浉鏈篒D
+ if (StringUtils.isNotEmpty(cameraId)) {
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setAlarmId(cameraId)
+ .setAlarmId(ardAlarmAccess.getId())
+ .setAlarmType("sys_external")
+ .setReceiveTime(ardAlarmAccess.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate);
+ messagesEnqueued(guideDataDto);
}
//endregion
}
@@ -1345,8 +1376,10 @@
* recordSn 褰曞儚瀛樺偍浣嶇疆 1-recordUrl1 2-recordUrl2
* targetPosition 鎶ヨ鐐逛綅缃潗鏍�
*/
- private void messagesEnqueued(String cameraId, String alarmId, String alarmType, Date receiveTime, Integer num, Integer recordSn, double[] targetPosition) {
+ private void messagesEnqueued(GuideDataDto guideDataDto) {
try {
+ String cameraId = guideDataDto.getCameraId();
+ String alarmType = guideDataDto.getAlarmType();
if (!IsEnableGuide(cameraId)) {
log.info("鐩告満:" + cameraId + "鏈紑鍚姤璀﹀紩瀵煎姛鑳�");
return;
@@ -1356,43 +1389,43 @@
//鐩告満ID
guideTask.setCameraId(cameraId);
//鎶ヨ绫诲瀷
- String aType = "";
switch (alarmType) {
case "杩愬姩鐩爣妫�娴�":
- aType = "sys_radar_move";
+ alarmType = "sys_radar_move";
break;
case "鐑簮妫�娴�":
- aType = "sys_radar_fire";
+ alarmType = "sys_radar_fire";
break;
case "闆疯揪鎶芥补鏈哄仠鏈�":
- aType = "sys_radar_pump";
- break;
- default:
- aType = alarmType;
+ alarmType = "sys_radar_pump";
break;
}
- guideTask.setAlarmType(aType);
+ guideTask.setAlarmType(alarmType);
//閫氶亾(閫氳繃鏃ュ鏃堕棿鐮斿垽)
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
guideTask.setChanNum(channel);
//鎶ヨID
- guideTask.setAlarmId(alarmId);
+ guideTask.setAlarmId(guideDataDto.getAlarmId());
//鎺ユ敹鏃堕棿
- guideTask.setReceiveTime(fmt.format(receiveTime));
+ guideTask.setReceiveTime(fmt.format(guideDataDto.getReceiveTime()));
//鎶ヨ浼樺厛绾�(閫氳繃浼樺厛绾у瓧鍏�)
- String priority = DictUtils.getDictValue("cameras_priority", aType);
+ String priority = DictUtils.getDictValue("cameras_priority", alarmType);
if (StringUtils.isEmpty(priority)) {
log.debug("鏈尮閰嶅埌浼樺厛绾�,璇锋鏌ヤ紭鍏堢骇瀛楀吀閰嶇疆");
return;
}
guideTask.setPriority(Integer.valueOf(priority));
//鎶ヨ娆℃暟
- guideTask.setNum(num);
+ guideTask.setNum(guideDataDto.getNum());
//褰曞儚瀛樺偍浣嶇疆
- guideTask.setRecordSn(recordSn);
+ guideTask.setRecordSn(guideDataDto.getRecordSn());
//鐩爣缁忕含搴�
- guideTask.setTargetPosition(targetPosition);
+ guideTask.setTargetPosition(guideDataDto.getTargetPosition());
+ //鐩爣PTZ
+ if (guideDataDto.getGuidePTZ() != null) {
+ guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());
+ }
//娑堟伅鍏ラ槦
queueManager.addTaskToQueue(cameraId, guideTask);
//鎵撳嵃闃熷垪
@@ -1421,7 +1454,7 @@
/**
* 鑾峰彇闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
*/
- private String getNearbyCamera(double[] targetPosition) {
+ private String getCameraByNear(double[] targetPosition) {
String minDistanceCameraId = "";
try {
//鑾峰彇鎵�鏈夊ぇ鍏夌數
@@ -1459,16 +1492,17 @@
return minDistanceCameraId;
}
- //闆疯揪鑾峰彇鐩告満寮曞鍏ラ槦
- private void radarGuideToQueue(String alarmId, String radarId, String name, String alarmType, Date createTime, double[] coordinate) {
- int index = name.indexOf("(");
- String alarmpointName = name.substring(0, index);
+ //鑾峰彇鐩告満寮曞鍏ラ槦
+ private void getCameraGuideToQueue(GuideDataDto guideDataDto) {
+ int index = guideDataDto.getName().indexOf("(");
+ String alarmpointName = guideDataDto.getName().substring(0, index);
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
- ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
+ ArdCameras cameraWithTower = ardEquipRadarMapper.getCameraByRadar(guideDataDto.getRadarId());
if (StringUtils.isNotNull(cameraWithTower)) {
log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraWithTower.getId());
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- messagesEnqueued(cameraWithTower.getId(), alarmId, alarmType, createTime, 1, 1, coordinate);
+ guideDataDto.setCameraId(cameraWithTower.getId());
+ messagesEnqueued(guideDataDto);
} else {
log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�,鏃犳硶寮曞");
}
@@ -1479,13 +1513,16 @@
if (cameraId.equals(cameraWithTower.getId())) {
return;
}
- log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
+ log.debug("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
//濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
- messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
+ guideDataDto.setCameraId(cameraId);
+ guideDataDto.setRecordSn(2);//鍏磋叮鐐瑰厜鐢靛紩瀵煎綍鍍忓瓨鍌ㄧ浜屼釜璺緞
+ messagesEnqueued(guideDataDto);
} else {
log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數,鏃犳硶寮曞");
}
}
+
//闆疯揪绉诲姩寮曞
private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
log.debug("闆疯揪绉诲姩寮�濮嬪紩瀵�");
@@ -1495,8 +1532,19 @@
}
double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
//寮曞鍏ラ槦
- radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setRadarId( ardAlarmRadarMove.getRadarId())
+ .setName(ardAlarmRadarMove.getName())
+ .setAlarmId(ardAlarmRadarMove.getId())
+ .setAlarmType(ardAlarmRadarMove.getAlarmType())
+ .setReceiveTime(ardAlarmRadarMove.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate)
+ .setGuidePTZ(ardAlarmRadarMove.getGuidePTZ());
+ getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
+
//闆疯揪闃茬伀寮曞
private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
log.debug("闆疯揪闃茬伀寮�濮嬪紩瀵�");
@@ -1506,8 +1554,19 @@
}
double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
//寮曞鍏ラ槦
- radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//鏇存柊
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setRadarId( ardAlarmRadarFire.getRadarId())
+ .setName(ardAlarmRadarFire.getName())
+ .setAlarmId(ardAlarmRadarFire.getId())
+ .setAlarmType(ardAlarmRadarFire.getAlarmType())
+ .setReceiveTime(ardAlarmRadarFire.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate)
+ .setGuidePTZ(ardAlarmRadarFire.getGuidePTZ());
+ getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
+
//闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
log.debug("闆疯揪鎶芥补鏈哄仠鏈哄紑濮嬪紩瀵�");
@@ -1518,7 +1577,16 @@
}
double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
//寮曞鍏ラ槦
- radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//鏇存柊
+ GuideDataDto guideDataDto = new GuideDataDto()
+ .setRadarId( ardAlarmRadarPump.getRadarId())
+ .setName(ardAlarmRadarPump.getName())
+ .setAlarmId(ardAlarmRadarPump.getId())
+ .setAlarmType(ardAlarmRadarPump.getAlarmType())
+ .setReceiveTime(ardAlarmRadarPump.getCreateTime())
+ .setNum(1)
+ .setRecordSn(1)
+ .setTargetPosition(coordinate)
+ .setGuidePTZ(ardAlarmRadarPump.getGuidePTZ());
+ getCameraGuideToQueue(guideDataDto);//鑾峰彇鐩告満鍏ラ槦
}
-
}
--
Gitblit v1.9.3