From 4c133c297ff25eddd1a30a4bce032affb334969a Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期二, 30 七月 2024 09:19:30 +0800 Subject: [PATCH] 三一车辆查询bug修改及电磁锁状态修改提交 --- ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 62 ++++++++++++++++++++++++++++++- 1 files changed, 60 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 8ab902e..557ae98 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 @@ -1,9 +1,15 @@ package com.ruoyi.sy.service; +import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Map; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.scheduling.domian.SchedulingParam; +import com.ruoyi.sy.domain.ArdAccessFence; import com.ruoyi.sy.domain.ArdSyCar; +import com.ruoyi.sy.domain.ArdSyUser; +import com.ruoyi.sy.param.ArdSyCarParam; import com.ruoyi.utils.result.Results; import org.springframework.web.multipart.MultipartFile; @@ -30,6 +36,8 @@ * @return 涓変竴杞﹁締闆嗗悎 */ public List<ArdSyCar> selectArdSyCarList(ArdSyCar ardSyCar); + + AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result); /** * 鏂板涓変竴杞﹁締 @@ -96,8 +104,21 @@ /** * 鏍规嵁閮ㄩ棬鍙戦�佽溅杈嗗疄鏃舵姤璀� */ - 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<Long> deptList); + + List<Map<String,String>> getCarList(ArdSyUser ardSyUser, String syURL,String usersId,String teamId); + + Results carListById(String id); /** @@ -105,6 +126,43 @@ * @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); + + Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser); + + String getSessionId(String syURL,ArdSyUser ardSyUser); + + Map<String, Object> getCarPicture(String carId, String syURL, String sessionId); + + 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); + + /** + * 鏍规嵁鐢ㄦ埛鍙婅溅杈嗕富閿拷韪溅杈� + */ + Results chaseCarByCarId(String usersId,String carId,String cycle); + + /** + * 鏍规嵁鏃堕棿鍙婅溅杈嗕富閿煡璇㈣鏈堟瘡澶╂槸鍚︽湁杞ㄨ抗 + */ + public Results getExistTraceByCarIdAndMonth(String userId,String carId,String time); + /** + * 鑾峰彇闄勮繎鑼冨洿鍐呯殑杞﹁締淇℃伅 + * */ + List<Map<String, Object>> getNearCar(SchedulingParam param); + /** + * 鑾峰彇闄勮繎鑼冨洿鍐呯殑杞﹁締淇℃伅(澶氳竟褰�) + * */ + List<Map<String, Object>> getNearCarWithPolygon(SchedulingParam param); + + List<ArdSyCar> all(); + + Map<String, Object> getAlarmHPfmCountDetail(String sessionId,String usersId,String carId,String startTime,String endTime,String syURL); + + public Map<String,Object> getOnlineSYCarPosition(String soilderId); } -- Gitblit v1.9.3