From 67d965cb476bde49109a3773532c33dd9de60518 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 13:30:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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 804fd16..247a4b9 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
@@ -97,7 +97,7 @@
     /**
      * 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃舵姤璀�
      */
-    public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data);
+    public void sendArdSyCarAlarmByCarId(String carId, Map<String,Object> data);
 //    List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
 
     /**
@@ -121,4 +121,18 @@
      */
     List<Map<String,String>> carIdByDeptList(List<Long> deptList,List<Map<String,String>> list);
 
+    Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser);
+
+    Results getCarGPSBycarId(String usersId,String carId,String syURL,ArdSyUser ardSyUser);
+
+    /**
+     * 鏍规嵁鐢ㄦ埛鍙婅溅杈嗕富閿拷韪溅杈�
+     */
+    Results chaseCarByCarId(String usersId,String carId,String cycle);
+
+    /**
+     * 鏍规嵁鏃堕棿鍙婅溅杈嗕富閿煡璇㈣鏈堟瘡澶╂槸鍚︽湁杞ㄨ抗
+     */
+    public Results getExistTraceByCarIdAndMonth(String userId,String carId,String time);
+
 }

--
Gitblit v1.9.3