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/scheduling/controller/SchedulingController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
index 63029af..dc7f2be 100644
--- a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
+++ b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
@@ -20,7 +20,7 @@
import java.util.Map;
/**
- * @Description:
+ * @Description: 涓�閿皟搴�
* @ClassName: SchedulingController
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�08鏈�17鏃�11:05:59
@@ -38,10 +38,9 @@
IArdAppPositionService iArdAppPositionService;
@GetMapping("/getNearVehiPersonCam")
- @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�")
+ @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�(鍗婂緞)")
AjaxResult getNearVehiPersonCam(SchedulingParam param) {
Map<String, Object> nearMap = new HashMap<>();
-
List<Map<String, Object>> Cars = iArdSyCarService.getNearCar(param);
nearMap.put("car", Cars);
List<ArdCameras> Cameras = iArdCamerasService.getNearCameras(param);
@@ -51,4 +50,16 @@
return AjaxResult.success(nearMap);
}
+ @PostMapping("/getPolygonVehiPersonCam")
+ @ApiOperation("鑾峰彇闄勮繎鐨勮溅浜虹浉鏈�(澶氳竟褰�)")
+ AjaxResult getPolygonVehiPersonCam(@RequestBody SchedulingParam param) {
+ Map<String, Object> nearMap = new HashMap<>();
+ List<Map<String, Object>> Cars = iArdSyCarService.getNearCarWithPolygon(param);
+ nearMap.put("car", Cars);
+ List<ArdCameras> Cameras = iArdCamerasService.getNearCamerasWithPolygon(param);
+ nearMap.put("camera", Cameras);
+ List<SysUser> AppUsers = iArdAppPositionService.getNearAppUsersWithPolygon(param);
+ nearMap.put("users", AppUsers);
+ return AjaxResult.success(nearMap);
+ }
}
--
Gitblit v1.9.3