From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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