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 | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 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 3e2c167..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 @@ -1,8 +1,10 @@ package com.ruoyi.sy.service; +import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Map; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.scheduling.domian.SchedulingParam; import com.ruoyi.sy.domain.ArdAccessFence; import com.ruoyi.sy.domain.ArdSyCar; @@ -125,7 +127,17 @@ 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); + + String getSessionId(String syURL,ArdSyUser ardSyUser); + + Map<String, Object> getCarPicture(String carId, String syURL, String sessionId); + + 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); /** * 鏍规嵁鐢ㄦ埛鍙婅溅杈嗕富閿拷韪溅杈� @@ -147,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