From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期四, 14 十二月 2023 13:30:49 +0800 Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件; --- ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java index 0b7e7a6..3ef2d72 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java @@ -87,4 +87,12 @@ Map<String, PriorityBlockingQueue<GuideTask>> cameraQueueMap = GuidePriorityQueue.cameraQueueMap; return AjaxResult.success(cameraQueueMap); } + + @PostMapping("/ThermalMapList") + @ApiOperation(value = "鐑姏鍥炬帴鍙�",notes = "鎸夋姤璀﹀埛鏂版椂闂存寜鎶ヨ绫诲埆鑱氬悎鏌ヨ") + @ApiOperationSupport(includeParameters = {"command","refreshTime"},order = 1) + public AjaxResult selectThermalMap(@RequestBody GlobalAlarmCondition condition) { + List<GlobalAlarmData> result = globalAlarmService.selectThermalMap(condition); + return AjaxResult.success(result); + } } -- Gitblit v1.9.3