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/sy/service/IArdSyCarService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
index d1ea79f..c89042b 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -127,13 +127,15 @@
Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser);
- Results getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser);
+ Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser);
- Map<String, Object> getCarPicture(String carId, String syURL, ArdSyUser ardSyUser);
+ String getSessionId(String syURL,ArdSyUser ardSyUser);
- Map<String, Object> sendCmd(String syURL,ArdSyUser ardSyUser,String carId, List<String> channelList) throws UnsupportedEncodingException;
+ Map<String, Object> getCarPicture(String carId, String syURL, String sessionId);
- Map<String, Object> getPhoto(String syURL,String carId,ArdSyUser ardSyUser,String startTime);
+ Map<String, Object> sendCmd(String userId,String syURL,String sessionId,String carId, List<String> channelList) throws UnsupportedEncodingException;
+
+ Map<String, Object> getPhoto(String syURL,String carId,String sessionId,String startTime);
Map<String, Object> getVideo(String syURL,String carId,ArdSyUser ardSyUser);
@@ -157,4 +159,6 @@
List<ArdSyCar> all();
+ Map<String, Object> getAlarmHPfmCountDetail(String sessionId,String usersId,String carId,String startTime,String endTime,String syURL);
+
}
--
Gitblit v1.9.3