From 0362c0c8502a81fc974afb8d2aff85d9efd7bbb1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 17:28:22 +0800
Subject: [PATCH] 修改报警逻辑 增加优先级队列
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 273 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 166 insertions(+), 107 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 90cbeb2..2fa6745 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -5,6 +5,8 @@
import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.domain.RadarAlarmData;
@@ -22,6 +24,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.constant.CamPriority;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.utils.tools.GisTool;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -54,19 +57,19 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
@Resource
- ArdAlarmRadarMapper ardAlarmRadarMapper;
+ private ArdAlarmRadarMapper ardAlarmRadarMapper;
@Resource
- ArdAlarmStealelecMapper ardAlarmStealelecMapper;
+ private ArdAlarmStealelecMapper ardAlarmStealelecMapper;
@Resource
- ArdAlarmTubeMapper ardAlarmTubeMapper;
+ private ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
- ArdAlarmCameraMapper ardAlarmCameraMapper;
+ private ArdAlarmCameraMapper ardAlarmCameraMapper;
@Resource
- ArdTubesMapper ardTubesMapper;
+ private ArdTubesMapper ardTubesMapper;
@Resource
- ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
+ private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@Resource
- ArdTubesDetailsMapper ardTubesDetailsMapper;
+ private ArdTubesDetailsMapper ardTubesDetailsMapper;
@Resource
private ISysConfigService configService;
@Resource
@@ -212,7 +215,7 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- @Async("alarmExecutor")
+// @Async("alarmExecutor")
public void receiveAlarm(String topic, String message) {
try {
switch (topic) {
@@ -227,28 +230,6 @@
int aas = ardAlarmStealelecMapper.insertArdAlarmStealelec(ardAlarmStealelec);
if (aas > 0) {
log.info("stealelec鍏ュ簱鎴愬姛锛�" + ardAlarmStealelec);
- ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
- if (well != null) {
- ardAlarmStealelec.setLongitude(well.getLongitude());
- ardAlarmStealelec.setLatitude(well.getLatitude());
- ardAlarmStealelec.setAltitude(well.getAltitude());
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("stealelec");
- cmd.setOperator("sys_steal_elec");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{well.getLongitude(), well.getLatitude(), well.getAltitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmStealelec.setRecordUrl(url);
- ardAlarmStealelecMapper.updateArdAlarmStealelec(ardAlarmStealelec);
- }
- }
- }
}
//endregion
break;
@@ -276,21 +257,9 @@
int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (aat > 0) {
log.debug("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("tube");
- cmd.setOperator("sys_tube_leak");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude(), ardAlarmTube.getAltitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmTube.setRecordUrl(url);
- ardAlarmTubeMapper.updateArdAlarmTube(ardAlarmTube);
- }
+ String nearbyCamera = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
+ if(StringUtils.isNotEmpty(nearbyCamera)) {
+ addTaskQueue(nearbyCamera, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getAlarmTime(), 1);
}
}
//endregion
@@ -299,25 +268,30 @@
//region 澶勭悊閫氱敤鍏夌數鎶ヨ
ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
ardAlarmCamera.setId(IdUtils.simpleUUID());
+
int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
if (aac > 0) {
log.debug("camera鍏ュ簱鎴愬姛锛�" + ardAlarmCamera);
- //寮曞褰曞儚
- CameraCmd cmd = new CameraCmd();
- cmd.setRecordBucketName("record");
- cmd.setRecordObjectName("camera");
- cmd.setOperator("sys_camera");
- cmd.setExpired(30);
- cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
- boolean res = guideCamera(cmd);
- if (res) {
- String url = alarmToRecord(cmd);
- if (StringUtils.isNotEmpty(url)) {
- //鏇存柊褰曞儚
- ardAlarmCamera.setRecordUrl(url);
- ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
- }
+ String nearbyCamera = getNearbyCamera(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
+ if(StringUtils.isNotEmpty(nearbyCamera)) {
+ addTaskQueue(nearbyCamera, ardAlarmCamera.getId(), "sys_camera", ardAlarmCamera.getAlarmTime(), 1);
}
+ //寮曞褰曞儚
+// CameraCmd cmd = new CameraCmd();
+// cmd.setRecordBucketName("record");
+// cmd.setRecordObjectName("camera");
+// cmd.setOperator("sys_camera");
+// cmd.setExpired(30);
+// cmd.setTargetPosition(new double[]{ardAlarmCamera.getLongitude(), ardAlarmCamera.getLatitude()});
+// boolean res = guideCamera(cmd);
+// if (res) {
+// String url = alarmToRecord(cmd);
+// if (StringUtils.isNotEmpty(url)) {
+// //鏇存柊褰曞儚
+// ardAlarmCamera.setRecordUrl(url);
+// ardAlarmCameraMapper.updateArdAlarmCamera(ardAlarmCamera);
+// }
+// }
}
//endregion
break;
@@ -325,35 +299,142 @@
//region 澶勭悊闆疯揪鎶ヨ
RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
- Map<String, Object> readyGuide = new HashMap<>();
for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
- ardAlarmRadar.setId(IdUtils.simpleUUID());
+ String uuid = IdUtils.simpleUUID();
+ ardAlarmRadar.setId(uuid);
ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());
- int aar = ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
- if (aar > 0) {
- log.debug("radar鍏ュ簱鎴愬姛锛�" + ardAlarmRadar);
+ String name = ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")";
+ ardAlarmRadar.setName(name);
+ ardAlarmRadar.setCreateTime(new Date());
+ String alarmType = "";
+ switch (ardAlarmRadar.getAlarmType()) {
+ case "杩愬姩鐩爣妫�娴�":
+ alarmType = "sys_radar_move";
+ break;
+ case "鐑簮妫�娴�":
+ alarmType = "sys_radar_fire";
+ break;
}
- readyGuide.put(ardAlarmRadar.getName(), ardAlarmRadar);//姣忎釜鎶ヨ鐐瑰彇鍑轰竴鏉℃姤璀�
+ //鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
+ ardAlarmRadar.setGuideFlag(1);
+ ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
+ if (StringUtils.isNull(AlarmRadar)) {
+ //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ //鍏ラ槦鍒楀緟寮曞
+ addTaskQueue(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), 1);
+ }
+ } else {
+ //5鍒嗛挓鍐呮湁寮曞
+ ardAlarmRadar.setGuideFlag(0);
+ int count = ardAlarmRadarMapper.getArdAlarmRadarWithNotGuide(ardAlarmRadar, AlarmRadar.getCreateTime());
+ if (count >= 3) {
+ //鏈紩瀵艰秴杩�3娆★紝鐩存帴鍏ュ簱鍏ラ槦
+ //5鍒嗛挓鍐呮湭寮曞鐩存帴鍏ュ簱
+ ardAlarmRadar.setGuideFlag(1);
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ //鍏ラ槦鍒楀緟寮曞
+ //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
+ String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
+ if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
+ //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
+ addTaskQueue(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getAlarmTime(), count);
+ }
+ } else {
+ //鏈紩瀵兼湭瓒呰繃3娆★紝鐩存帴鍏ュ簱
+ ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
+ }
+
+ }
+
+
+ //鑾峰彇鍏磋叮鐐瑰叧鑱旂殑澶у厜鐢�
+// ArdAlarmpointsWell well=new ArdAlarmpointsWell();
+// well.setWellId(ardAlarmRadar.getName());
+// List<ArdAlarmpointsWell> ardAlarmpointsWells = ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(well);
+// if(ardAlarmpointsWells!=null&&ardAlarmpointsWells.size()>0)
+// {
+// String cameraIdWithWell = ardAlarmpointsWells.get(0).getCameraId();
+// }
+
}
- //鑾峰彇姣忎釜鎶ヨ鐐瑰叧鑱旂殑鐩告満
-
- //鍏堟壘鎶ヨ闆疯揪濉斾笂鐨勭浉鏈�
- CameraCmd cmd = new CameraCmd();
- cmd.setCameraId("1");
- cmd.setChannelNum(1);
- boolean b = guideCamera(cmd);
-
- //鍐嶆壘鎶ヨ鐐瑰叧鑱旂殑鐩告満
- cmd.setCameraId("2");
- cmd.setChannelNum(1);
- boolean b1 = guideCamera(cmd);
-
+ printPriorityQueue();
//endregion
break;
}
+ printPriorityQueue();
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
+ }
+
+ /**
+ * 寮曞浠诲姟鍏ラ槦鏂规硶
+ */
+ private void addTaskQueue(String cameraId, String alarmId, String alarmType, Date alarmTime, Integer num) {
+
+ GuideTask guideTask = new GuideTask();
+ guideTask.setCameraId(cameraId);
+ guideTask.setAlarmId(alarmId);
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ guideTask.setAlarmTime(fmt.format(alarmTime));
+ Integer priority = CamPriority.priorityMap.get(alarmType);
+ guideTask.setPriority(priority);
+ guideTask.setNum(num);
+
+ PriorityQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(guideTask.getCameraId());
+ priorityQueue.add(guideTask);
+ }
+
+ /**
+ * 鎵撳嵃闃熷垪
+ */
+ private void printPriorityQueue() {
+ for (String cameraId : GuidePriorityQueue.cameraQueueMap.keySet()) {
+ log.info("cameraId" + cameraId);
+ PriorityQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
+ for (GuideTask task : priorityQueue) {
+ log.info("alarmId:" + task.getAlarmId() + " alarmTime:" + task.getAlarmTime() + " priority:" + task.getPriority() + " num:" + task.getNum() + " cameraId:" + task.getCameraId());
+ }
+
+ }
+ }
+
+ /**
+ * 鏌ユ壘闄勮繎寮�鍚姤璀﹀紩瀵煎姛鑳藉厜鐢�
+ */
+ private String getNearbyCamera(double[] targetPosition) {
+ String minDistanceCameraId = "";
+ //鑾峰彇鎵�鏈夊ぇ鍏夌數
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
+ //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
+ Map<String, Double> distanceMap = new HashMap<>();
+ Map<String, Integer> guideMap = new HashMap<>();
+ for (ArdCameras camera : ardCamerasList) {
+ double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
+ double distance = GisTool.getDistance(targetPosition, camPosition);
+ if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
+ distanceMap.put(camera.getId(), distance);
+ if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
+ camera.setCamAlarmGuideEnable(0);
+ }
+ guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
+ }
+ }
+ if (distanceMap.size() > 0) {
+ log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
+ //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
+ minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
+ log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId);
+ if (guideMap.get(minDistanceCameraId).equals(0)) {
+ log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
+ return " ";
+ }
+ }
+ return minDistanceCameraId;
}
/**
@@ -367,45 +448,23 @@
private boolean guideCamera(CameraCmd cmd) {
try {
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- //鑾峰彇鎵�鏈夊ぇ鍏夌數
- List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
- //缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
- Map<String, Double> distanceMap = new HashMap<>();
- Map<String, Integer> guideMap = new HashMap<>();
- for (ArdCameras camera : ardCamerasList) {
- double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
- if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
- distanceMap.put(camera.getId(), distance);
- if (StringUtils.isNull(camera.getCamAlarmGuideEnable())) {
- camera.setCamAlarmGuideEnable(0);
- }
- guideMap.put(camera.getId(), camera.getCamAlarmGuideEnable());
- }
- }
- if (distanceMap.size() > 0) {
- log.debug("灏濊瘯鏌ユ壘鏈�杩戝厜鐢�");
- //鑾峰彇璺濈瀛楀吀涓渶杩戠殑涓�涓浉鏈篒D
- String minDistanceCameraId = ArdTool.getKeyByMinValue(distanceMap);
- log.debug("鏌ユ壘鍒版渶杩戝厜鐢�:" + minDistanceCameraId + "锛屽皾璇曞紩瀵�");
- if (guideMap.get(minDistanceCameraId).equals(0)) {
- log.debug("璇ュ厜鐢垫湭寮�鍚姤璀﹀紩瀵�");
- return false;
- }
+ String nearbyCamera = getNearbyCamera(cmd.getTargetPosition());
+ if (StringUtils.isNotEmpty(nearbyCamera)) {
//寮曞鍏夌數
- cmd.setCameraId(minDistanceCameraId);
+ cmd.setCameraId(nearbyCamera);
cmd.setChannelNum(ArdTool.getChannelBydayNightTime(dayNightTime));
boolean guideRes = hikClientService.guideTargetPosition(cmd);
return guideRes;
-
} else {
log.debug("鏈煡鎵惧埌鏈�杩戝厜鐢�");
return false;
}
- } catch (Exception ex) {
+ } catch (
+ Exception ex) {
log.error("寮曞寮傚父:" + ex.getMessage());
return false;
}
+
}
/**
--
Gitblit v1.9.3