From 342b6590ee28cc1a7b501287ce57eec1d6d166b8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 d8c32cb..8377be5 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;
@@ -83,8 +84,6 @@
*/
public String uploadCarPicture(String id, MultipartFile carPicture);
- List<ArdSyCar> carListById(String id);
-
/**
* 鏍规嵁杞﹁締id鏌ヨ涓変竴杞﹁締鍙婂搴旈儴闂�
*/
@@ -94,7 +93,34 @@
* 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃朵綅缃�
*/
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);
+ /**
+ * 鏍规嵁dept闆嗗悎鏌ヨ鍑烘墍鏈夊搴旂殑carId
+ * @param deptList
+ * @return
+ */
+ List<Map<String,String>> carIdByDeptList(List<Long> deptList,List<Map<String,String>> list);
+
+ Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser);
+
}
--
Gitblit v1.9.3