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/device/radar/controller/ArdEquipRadarController.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java index 62de8d8..658f2e2 100644 --- a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java +++ b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java @@ -1,6 +1,7 @@ package com.ruoyi.device.radar.controller; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -117,11 +118,22 @@ return toAjax(ardEquipRadarService.deleteArdEquipRadarByIds(ids)); } + /** + * 瑙掑害寮曞淇℃伅鍙嶉 + */ @ApiOperation(value = "瑙掑害寮曞淇℃伅鍙嶉") - @PostMapping("/guideInfo") + @PostMapping("/guideInfoBack") public AjaxResult guideInfoBack(@RequestBody GuideInfo guideInfo) { return radarClient.guideInfoBack(guideInfo); } - + /** + * 鑾峰彇閮ㄩ棬鍜岄浄杈� + */ + @GetMapping("/getDeptAndRadar") + @ApiOperation("鑾峰彇閮ㄩ棬鍜岄浄杈�") + public AjaxResult getDeptAndCamera() { + Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true); + return AjaxResult.success(deptAndCamera); + } } -- Gitblit v1.9.3