From 9b4b385d1a4d34ef6ba3fa586c1e3c2c5fcb12c1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 30 六月 2023 17:29:17 +0800
Subject: [PATCH] 提交雷达报警
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 3 +
ard-work/src/main/java/com/ruoyi/constant/CamPriority.java | 7 +--
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 2
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 10 +++++
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java | 2
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 1
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java | 36 ++----------------
7 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index e62c2dd..299c1d7 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -4,6 +4,8 @@
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
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.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
@@ -17,6 +19,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.PriorityBlockingQueue;
/**
* @ClassName: globalAlarmController
@@ -70,4 +73,11 @@
Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
return getDataTable((List)alarmList);
}
+
+ @GetMapping("/getQueueList")
+ @ApiOperation(value = "鏌ヨ闃熷垪",notes = "鏌ヨ鎵�鏈夌浉鏈虹殑褰撳墠闃熷垪")
+ public AjaxResult getQueueList() {
+ Map<String, PriorityBlockingQueue<GuideTask>> cameraQueueMap = GuidePriorityQueue.cameraQueueMap;
+ return AjaxResult.success(cameraQueueMap);
+ }
}
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 72bcc71..776da58 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
@@ -40,41 +40,13 @@
public static void printPriorityQueue() {
for (String cameraId : GuidePriorityQueue.cameraQueueMap.keySet()) {
PriorityBlockingQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
- PriorityQueue<GuideTask> queue= new PriorityQueue<>(priorityQueue);
+ PriorityBlockingQueue<GuideTask> queue = new PriorityBlockingQueue<>(priorityQueue);
while (queue.size() > 0) {
GuideTask task = queue.poll();
- log.info("銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
- + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
- + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn() + "銆恈ameraId銆�" + task.getCameraId());
+ log.info("姝ｅ湪鎺掗槦銆恈ameraId銆�" + task.getCameraId()+"銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
+ + "銆恆larmType銆�" + task.getAlarmType() + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
+ + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn());
}
}
}
-
-
- public static void main(String[] args) {
- Comparator<obj> com1 = Comparator.comparingInt(obj::getNUM1).reversed();
- Comparator<obj> com2 = Comparator.comparingInt(obj::getNUM2).reversed();
- Comparator<obj> com3 = Comparator.comparingInt(obj::getNUM3).reversed();
- Comparator<obj> objComparator = com1.thenComparing(com2).thenComparing(com3);
- PriorityQueue<obj> priorityQueue = new PriorityQueue<>(objComparator);
- priorityQueue.add(new obj(1, 1, 65));
- priorityQueue.add(new obj(1, 4, 21));
- priorityQueue.add(new obj(1, 4, 33));
- priorityQueue.add(new obj(1, 4, 44));
- priorityQueue.add(new obj(1, 4, 51));
- PriorityQueue<obj> queue= new PriorityQueue<>(priorityQueue);
- while (queue.size() > 0) {
- obj task = queue.poll();
- log.info("銆恘um1銆�" + task.getNUM1() + "銆恘um2銆�" + task.getNUM2() + "銆恘um3銆�" + task.getNUM3());
- }
- log.info("=======================================================================");
- }
-}
-
-@Data
-@AllArgsConstructor
-class obj {
- Integer NUM1;
- Integer NUM2;
- Integer NUM3;
}
\ No newline at end of file
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 6097259..63a106c 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
@@ -440,7 +440,6 @@
//endregion
break;
}
- GuidePriorityQueue.printPriorityQueue();//鎵撳嵃闃熷垪
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
}
@@ -482,6 +481,8 @@
guideTask.setTargetPosition(targetPosition);
//娑堟伅鍏ラ槦
queueManager.addTaskToQueue(cameraId, guideTask);
+ //鎵撳嵃闃熷垪
+ GuidePriorityQueue.printPriorityQueue();
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
index aef3545..c4cf0fe 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java
@@ -93,7 +93,7 @@
try {
GuideTask task = queue.take();
taskExecutor.processTask(task);
- GuidePriorityQueue.printPriorityQueue();
+ // GuidePriorityQueue.printPriorityQueue();
// 鏇存柊绾跨▼鐨勫綋鍓嶄换鍔�
TaskThread currentTaskThread = threadMap.get(queueName);
if (currentTaskThread != null) {
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
index 4f4ce6a..d4c5e1f 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
@@ -1,5 +1,6 @@
package com.ruoyi.alarm.globalAlarm.service.impl;
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
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 f997ff0..02214af 100644
--- a/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java
+++ b/ard-work/src/main/java/com/ruoyi/constant/CamPriority.java
@@ -22,11 +22,8 @@
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);//鐩楃數鎶ヨ
+ priorityMap.put("sys_radar_move", 900);//闆疯揪绉诲姩鎶ヨ
+ priorityMap.put("sys_tube_leak", 800);//绠＄嚎娉勯湶鎶ヨ
priorityMap.put("sys_patrol_inspect", 1);//宸℃
}
-
}
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 b250206..97944f4 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
@@ -701,7 +701,7 @@
String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(cameraId);
Date now = new Date();
- now.setTime(now.getTime() + cmd.getExpired() * 60);
+ now.setTime(now.getTime() + cmd.getExpired() * 1000);
ardCameras.setOperatorExpired(now);//璁剧疆褰撳墠杩囨湡鏃堕棿
ardCamerasMapper.updateArdCameras(ardCameras);
// String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
--
Gitblit v1.9.3