From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 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 6ef3b32..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
@@ -4,6 +4,7 @@
import java.util.Map;
import com.ruoyi.sy.domain.ArdSyCar;
+import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.utils.result.Results;
import org.springframework.web.multipart.MultipartFile;
@@ -92,7 +93,25 @@
* 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃朵綅缃�
*/
public void sendArdSyCarPosition();
+
+ /**
+ * 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃舵姤璀�
+ */
+ public void sendArdSyCarAlarmByCarId(String carId, Map<String,Object> data);
// List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃
+ * @param ardSyUser
+ * @param syURL
+ * @param usersId
+ * @return
+ */
+ Map<String,Object> allListByUser(ArdSyUser ardSyUser, String syURL,String usersId);
+
+ List<Map<String,String>> getCarList(ArdSyUser ardSyUser, String syURL,String usersId,String teamId);
+
+
Results carListById(String id);
/**
@@ -100,6 +119,20 @@
* @param deptList
* @return
*/
- List<ArdSyCar> carIdByDeptList(List<Long> deptList);
+ 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