From 20439bc0fa1ff714ed5f61e711272deebb76e2c9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 17 八月 2023 16:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 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 3538608..4b7a002 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
@@ -3,7 +3,9 @@
import java.util.List;
import java.util.Map;
+import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.sy.domain.ArdSyCar;
+import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.utils.result.Results;
import org.springframework.web.multipart.MultipartFile;
@@ -96,8 +98,45 @@
/**
* 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃舵姤璀�
*/
- public void sendArdSyCarAlarmByCarId(String carId, Map<Integer,Object> data);
+ 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);
+
+ 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);
+ /**
+ * 鑾峰彇闄勮繎鑼冨洿鍐呯殑杞﹁締淇℃伅
+ * */
+ List<Map<String, Object>> getNearCar(SchedulingParam param);
}
--
Gitblit v1.9.3