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 +++++++++++++++++++++++---------------
ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java | 8 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 7
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 5
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java | 7
ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/RadarAlarmData.java | 5
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java | 6
/dev/null | 42 ------
ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java | 15 ++
ard-work/src/main/java/com/ruoyi/constant/CamPriority.java | 6
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 2
ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/ArdAlarmRadar.java | 7
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 27 +++
13 files changed, 244 insertions(+), 166 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
index 937237d..11c5aac 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
@@ -1,13 +1,12 @@
package com.ruoyi.alarm.globalAlarm.domain;
-import com.ruoyi.alarm.globalAlarm.service.impl.GuideTask;
-
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
+import java.util.PriorityQueue;
/**
- * @Description:
+ * @Description: 寮曞浼樺厛绾ч槦鍒�
* @ClassName: PriorityQueue
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�06鏈�29鏃�11:18
@@ -17,7 +16,7 @@
/**
* 鐩告満闃熷垪锛屾瘡涓浉鏈轰竴涓紭鍏堢骇闃熷垪
*/
- public static Map<String, java.util.PriorityQueue<GuideTask>> cameraQueueMap = new HashMap<>();
+ public static Map<String, PriorityQueue<GuideTask>> cameraQueueMap = new HashMap<>();
/**
* 鍒涘缓涓�涓嚜瀹氫箟鐨勬瘮杈冨櫒锛屾牴鎹紭鍏堢骇灞炴�ц繘琛屾瘮杈�
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GuideTask.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
similarity index 73%
rename from ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GuideTask.java
rename to ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
index 56ea080..7636988 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GuideTask.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuideTask.java
@@ -1,7 +1,8 @@
-package com.ruoyi.alarm.globalAlarm.service.impl;
+package com.ruoyi.alarm.globalAlarm.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @Description: 寮曞浠诲姟
@@ -11,11 +12,12 @@
* @Version: 1.0
**/
@Data
+@NoArgsConstructor
@AllArgsConstructor
public class GuideTask {
+ String cameraId;
String alarmId;
- String alarmType;
Integer priority;
String alarmTime;
Integer num;
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;
}
+
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/PriorityQueueExample.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/PriorityQueueExample.java
deleted file mode 100644
index fa468d4..0000000
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/PriorityQueueExample.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.alarm.globalAlarm.service.impl;
-import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
-import java.util.Comparator;
-import java.util.PriorityQueue;
-/**
- * @Description:
- * @ClassName: PriorityQueueExample
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�06鏈�29鏃�10:41
- * @Version: 1.0
- **/
-
-public class PriorityQueueExample {
- public static void main(String[] args) {
-
- Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
- // 鍒涘缓鐩告満1鐨勪紭鍏堢骇闃熷垪锛屽苟浼犲叆鑷畾涔夌殑姣旇緝鍣�
- PriorityQueue<GuideTask> queue1 = new PriorityQueue<>(comparator);
- // 娣诲姞瀵硅薄鍒伴槦鍒椾腑
- GuideTask task1 = new GuideTask("task1", "radar", 999, "2023-06-29 11:10:00", 1);
- GuideTask task2 = new GuideTask("task2", "radar", 999, "2023-06-29 11:11:00", 2);
- GuideTask task3 = new GuideTask("task3", "radar", 999, "2023-06-29 11:12:00", 1);
- GuideTask task4 = new GuideTask("task4", "radar", 888, "2023-06-29 11:13:00", 3);
- queue1.add(task1);
- queue1.add(task2);
- queue1.add(task3);
- queue1.add(task4);
-
-
- GuidePriorityQueue.cameraQueueMap.put("鐩告満1", queue1);
-
- for (String camera : GuidePriorityQueue.cameraQueueMap.keySet()) {
- PriorityQueue<GuideTask> queue = GuidePriorityQueue.cameraQueueMap.get(camera);
-
- // 渚濇鍙栧嚭闃熷垪涓殑瀵硅薄骞舵墦鍗�
- while (!queue.isEmpty()) {
- GuideTask obj = queue.poll();
- System.out.println(obj.getAlarmId() + " - Priority: " + obj.getPriority() + "- Num:" + obj.getNum() + "- time-" + obj.getAlarmTime());
- }
- }
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/ArdAlarmRadar.java b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/ArdAlarmRadar.java
index c41e78d..2a92045 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/ArdAlarmRadar.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/ArdAlarmRadar.java
@@ -69,7 +69,8 @@
* 鏈鎶ヨ鏁伴噺
*/
private Integer count;
-
-
-
+ /**
+ * 寮曞鏍囪
+ */
+ private Integer guideFlag;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/RadarAlarmData.java b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/RadarAlarmData.java
index 2d8da84..3fa809d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/RadarAlarmData.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/domain/RadarAlarmData.java
@@ -17,11 +17,14 @@
@Data
public class RadarAlarmData {
+ /** 闆疯揪id */
+ private String radarId;
+ /** 闆疯揪鍚嶇О*/
+ private String radarName;
/** 鎶ヨ鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎶ヨ鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date alarmTime;
-
private List<ArdAlarmRadar> ardAlarmRadars;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
index 5f6d460..ae971ad 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
@@ -2,6 +2,8 @@
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
import java.util.List;
@@ -63,4 +65,17 @@
public List<ArdAlarmRadar> selectListAllByCommand(@Param("refreshTime")String refreshTime,@Param("alarmType")String alarmType);
int selectCountByAlarmTime(@Param("refreshTime")String refreshTime,@Param("alarmType")String alarmType);
+
+ /**
+ * 閫氳繃闆疯揪id鎵惧埌鍏宠仈濉斾笂鐨勫ぇ鍏夌數id
+ *
+ */
+ String getCameraByRadar(String radarId);
+
+ /**
+ * 鏌ユ壘5鍒嗛挓鍐呭紩瀵艰繃鐨勮褰�
+ * */
+ public ArdAlarmRadar getArdAlarmRadarWithGuide(ArdAlarmRadar ardAlarmRadar);
+
+ public int getArdAlarmRadarWithNotGuide(@Param("ardAlarmRadar")ArdAlarmRadar ardAlarmRadar, @Param("guideTime")Date guideTime);
}
diff --git a/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java b/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java
index 6ccff29..a9315b5 100644
--- a/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java
+++ b/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java
@@ -1,10 +1,7 @@
package com.ruoyi.constant;
-import com.ruoyi.alarm.globalAlarm.service.impl.GuideTask;
-
import java.util.HashMap;
import java.util.Map;
-import java.util.PriorityQueue;
/**
* @Description: 鐩告満鎺у埗浼樺厛绾�
@@ -15,9 +12,10 @@
**/
public class CamPriority {
- public static Map<String,Object> priorityMap=new HashMap<>();
+ public static Map<String,Integer> priorityMap=new HashMap<>();
static {
priorityMap.put("sys_radar_fire",999);//闆疯揪闃茬伀鎶ヨ
+ priorityMap.put("sys_radar_move",999);//闆疯揪绉诲姩鎶ヨ
priorityMap.put("sys_tube_leak",998);//绠＄嚎娉勯湶鎶ヨ
priorityMap.put("sys_camera",997);//閫氱敤鍏夌數鎶ヨ
priorityMap.put("sys_steal_elec",996);//鐩楃數鎶ヨ
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index d7295fc..9a5e8ed 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -210,7 +210,7 @@
log.debug("鍔犺浇lib瀹屾垚锛�");
List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras camera : ardCameras) {
- Thread.sleep(100);
+ Thread.sleep(500);
login(camera);
}
} catch (Exception ex) {
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
index b3c34c7..a4d1d6c 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
@@ -1,5 +1,7 @@
package com.ruoyi.device.hiksdk.util.hikSdkUtil;
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
@@ -9,6 +11,8 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.PriorityQueue;
/**
* @Description: 寮傛鐧诲綍鍥炶皟
@@ -35,6 +39,10 @@
log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
camera.setLoginId(lUserID);
camera.setChannel((int) lpDeviceinfo.byChanNum);
+ //鍒涘缓寮曞闃熷垪
+ Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
+ PriorityQueue<GuideTask> priorityQueue=new PriorityQueue<>(comparator);
+ GuidePriorityQueue.cameraQueueMap.put(camera.getId(),priorityQueue);
} else {
log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
camera.setChannel(0);
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 1a98bc8..3068afe 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -63,6 +63,7 @@
<if test="createTime != null">create_time,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
+ <if test="guideFlag != null">guide_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -77,6 +78,7 @@
<if test="createTime != null">#{createTime},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
+ <if test="guideFlag != null">#{guideFlag},</if>
</trim>
</insert>
@@ -94,6 +96,7 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="guideFlag != null">guide_flag = #{guideFlag},</if>
</trim>
where id = #{id}
</update>
@@ -140,4 +143,28 @@
WHERE aar.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
and aar.alarm_type = #{alarmType}
</select>
+ <select id="getCameraByRadar" resultType="String">
+ select ac.id
+ from ard_equip_radar aer
+ INNER JOIN ard_towers at
+ on aer.tower_id= at.id
+ INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
+ </select>
+ <select id="getArdAlarmRadarWithGuide" resultMap="ArdAlarmRadarResult">
+ select *
+ from ard_alarm_radar
+ where create_time > current_timestamp - interval '5' minute
+ and guide_flag = #{guideFlag}
+ and alarm_type =#{alarmType}
+ and name = #{name}
+ ORDER BY create_time desc limit 1
+ </select>
+ <select id="getArdAlarmRadarWithNotGuide" resultType="Integer">
+ select count(*)
+ from ard_alarm_radar
+ where create_time >= #{guideTime}
+ and guide_flag = #{ardAlarmRadar.guideFlag}
+ and alarm_type =#{ardAlarmRadar.alarmType}
+ and name = #{ardAlarmRadar.name}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index e2bec71..00f2c57 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -27,6 +27,7 @@
public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+ public static String YYYY_MM_DD_HH_MM_SS_MS = "yyyy-MM-dd HH:mm:ss.fff";
public static String HH_MM_SS = "HH:mm:ss";
private static String[] parsePatterns = {
@@ -58,12 +59,14 @@
{
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
}
-
public static final String dateTimeNow()
{
return dateTimeNow(YYYYMMDDHHMMSS);
}
-
+ public static final String dateTimeNowMS()
+ {
+ return dateTimeNow(YYYY_MM_DD_HH_MM_SS_MS);
+ }
public static final String dateTimeNow(final String format)
{
return parseDateToStr(format, new Date());
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
index 00e9fc9..674c5bd 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.websocket.util.WebSocketUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
@@ -46,6 +47,10 @@
cmd.setCameraId(camera.getId());
cmd.setChannelNum(1);
Map<String, Object> ptz = hikClientService.getPtz(cmd);
+ if(StringUtils.isNull(ptz))
+ {
+ continue;
+ }
if (ptz.size() > 0) {
ptz.put("cameraId", camera.getId());
ptz.put("operatorExpired",camera.getOperatorExpired());
--
Gitblit v1.9.3