From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 一月 2024 15:13:43 +0800
Subject: [PATCH] 单兵端查看已通过的申请提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 321 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 277 insertions(+), 44 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 83789ea..8df1d76 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -2,6 +2,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -13,29 +15,36 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dtflys.forest.annotation.Var;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.app.application.domain.ArdAppApplication;
+import com.ruoyi.app.application.mapper.ArdAppApplicationMapper;
+import com.ruoyi.app.position.mapper.ArdAppPositionMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.utils.tools.Point;
+import com.ruoyi.sy.domain.ArdAccessFence;
+import com.ruoyi.sy.param.ArdSyCarParam;
+import com.ruoyi.sy.vo.ArdSyCarVo;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.utils.gis.GisUtil;
+import com.ruoyi.utils.gis.Point;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.sy.domain.ArdSyCarDay;
import com.ruoyi.sy.mapper.ArdSyCarDayMapper;
-import com.ruoyi.utils.tools.GisTool;
+import com.ruoyi.utils.minio.MinioUtil;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
-import com.ruoyi.storage.minio.utils.MinioConfig;
-import com.ruoyi.storage.minio.utils.MinioUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
import com.ruoyi.sy.mapper.ArdSyUserMapper;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
-import io.minio.ListObjectsArgs;
-import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
import io.minio.messages.Item;
@@ -45,6 +54,7 @@
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.domain.ArdSyCar;
@@ -82,8 +92,16 @@
RedisCache redisCache;
@Resource
private ArdSyCarDayMapper ardSyCarDayMapper;
+
@Resource
- private MinioUtils minioUtil;
+ private ArdAppApplicationMapper ardAppApplicationMapper;
+
+ @Resource
+ private SysDeptMapper sysDeptMapper;
+
+ @Value("${minio.endpoint}")
+ private String minioEndpoint;
+
private Map<Integer, Map<String, String>> logInMap = new HashMap();
private Map<String, Timer> userCarTimerMap = new HashMap();
@@ -108,6 +126,52 @@
@Override
public List<ArdSyCar> selectArdSyCarList(ArdSyCar ardSyCar) {
return ardSyCarMapper.selectArdSyCarList(ardSyCar);
+ }
+
+ @Override
+ public AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result) {
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.like(ardSyCarParam.getCarBrand()!=null,"car_brand",ardSyCarParam.getCarBrand())
+ .like(ardSyCarParam.getCarType()!=null,"car_type",ardSyCarParam.getCarType());
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
+ if(((String)result.get("code")).equals("200")){
+ List<Map<String,Object>> list = (List<Map<String, Object>>) result.get("data");
+ for (int i = 0; i < ardSyCars.size(); i++) {
+ ArdSyCar ardSyCar = ardSyCars.get(i);
+ String carId = ardSyCar.getCarId();
+ for (int j = 0; j < list.size(); j++) {
+ String carId31 = (String) list.get(j).get("carId");
+ if(carId.equals(carId31)){
+ ArdSyCarVo ardSyCarVo = new ArdSyCarVo();
+ ardSyCarVo.setId(ardSyCar.getId());
+ ardSyCarVo.setCarId(carId);
+ ardSyCarVo.setCarBrand(ardSyCar.getCarBrand());
+ ardSyCarVo.setCarModel(ardSyCar.getCarModel());
+ ardSyCarVo.setCarPicture(ardSyCar.getCarPicture());
+ ardSyCarVo.setCarType(ardSyCar.getCarType());
+ ardSyCarVo.setDeptId(ardSyCar.getDeptId());
+ ardSyCarVo.setRemark(ardSyCar.getRemark());
+ ardSyCarVo.setCarPlate((String) list.get(j).get("carPlate"));
+ ardSyCarVoList.add(ardSyCarVo);
+ break;
+ }
+ }
+ }
+ if(ardSyCarParam.getCarPlate()!=null){
+ List<ArdSyCarVo> newList = new ArrayList<>();
+ for (int i = 0; i < ardSyCarVoList.size(); i++) {
+ String carPlate = ardSyCarVoList.get(i).getCarPlate();
+ if(!carPlate.contains(ardSyCarParam.getCarPlate())){
+ newList.add(ardSyCarVoList.get(i));
+ }
+ }
+ ardSyCarVoList.removeAll(newList);
+ }
+ return AjaxResult.success(new PageInfo<>(ardSyCarVoList));
+ }else {
+ return AjaxResult.error("31骞冲彴杩炴帴澶辫触锛岃溅鐗屽彿鑾峰彇澶辫触锛�",new PageInfo<>(ardSyCars));
+ }
}
/**
@@ -147,7 +211,7 @@
objectNames.add(ardSyCar.getCarPicture().split("/sycar/")[1]);
}
}
- minioUtil.removeObjects("sycar", objectNames);
+ MinioUtil.removeObjects("sycar", objectNames);
return ardSyCarMapper.deleteArdSyCarByIds(ids);
}
@@ -264,17 +328,19 @@
@Override
public List<Map<String, String>> getAllCarModel() {
- boolean exsit = minioUtil.exitsBucket("sycar");
+ boolean exsit = MinioUtil.exitsBucket("sycar");
if (exsit) {
List<Map<String, String>> listObjetcName = new ArrayList<>();
try {
// ListObjectsArgs listObjectsArgs = ListObjectsArgs.builder().prefix("carmodel/").bucket("sycar").build();
- Iterable<Result<Item>> myObjects = minioUtil.getObjectsByBucket("sycar","carmodel");
+ Iterable<Result<Item>> myObjects = MinioUtil.getObjectsByBucket("sycar","carmodel");
for (Result<Item> result : myObjects) {
Item item = result.get();
Map<String, String> map = new HashMap();
+ String[] strArr = item.objectName().split("/");
+ map.put("carType", strArr[1]);
map.put("carModel", "sycar/" + item.objectName());
- switch (item.objectName()) {
+ /*switch (item.objectName()) {
case "carmodel/aodi.glb":
map.put("carType", "濂ヨ开");
break;
@@ -313,11 +379,12 @@
break;
default:
break;
- }
+ }*/
listObjetcName.add(map);
}
return listObjetcName;
} catch (Exception ex) {
+ ex.printStackTrace();
//log.error("minio鑾峰彇妗朵笅瀵硅薄寮傚父锛�" + ex.getMessage());
}
}
@@ -332,16 +399,16 @@
if (ardSyCarr.getCarPicture() != null || !ardSyCarr.getCarPicture().equals("")) {
String objectName = ardSyCarr.getCarPicture().split("/sycar/")[1];
objectNames.add(objectName);
- minioUtil.removeObjects("sycar", objectNames);
+ MinioUtil.removeObjects("sycar", objectNames);
}
}
//鍒ゆ柇鏂囦欢鏄惁涓虹┖
if (null == carPicture || 0 == carPicture.getSize()) {
return "";
}
- boolean exsit = minioUtil.exitsBucket("sycar");
+ boolean exsit = MinioUtil.exitsBucket("sycar");
if (!exsit) {
- boolean bucket = minioUtil.createBucket("sycar");
+ boolean bucket = MinioUtil.createBucket("sycar");
}
//鏂囦欢鍚�
String originalFilename = carPicture.getOriginalFilename();
@@ -358,7 +425,7 @@
// .contentType(carPicture.getContentType())
// .build();
// MinioConfig.getMinioClient().putObject(putObjectArgs);
- minioUtil.uploadObject("sycar",fileName,inputStream,carPicture.getSize(),carPicture.getContentType());
+ MinioUtil.uploadObject("sycar",fileName,inputStream,carPicture.getSize(),carPicture.getContentType());
inputStream.close();
/*鑾峰彇url*/
GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs
@@ -368,7 +435,7 @@
.method(Method.GET)
.build();
//String presignedObjectUrl = MinioConfig.getMinioClient().getPresignedObjectUrl(getPresignedObjectUrlArgs);
- String ObjectUrl = minioUtil.getBucketObjectUrl("sycar", fileName);
+ String ObjectUrl = MinioUtil.getBucketObjectUrl("sycar", fileName);
if (id != null && !id.equals("")) {//id涓洪潪蹇呰
ArdSyCar ardSyCar = new ArdSyCar();
ardSyCar.setId(id);
@@ -409,8 +476,9 @@
if (result != null) {
if (result.get("carPicture") != null) {
if (!((String) result.get("carPicture")).equals("")) {
- String url = ((String) result.get("carPicture")).split("sycar")[0];
- String carModel = url + (String) result.get("carModel");
+ /*String url = ((String) result.get("carPicture")).split("sycar")[0];
+ String carModel = url + (String) result.get("carModel");*/
+ String carModel = this.minioEndpoint + "/" + (String) result.get("carModel");
result.put("carModel", carModel);
}
}
@@ -476,7 +544,7 @@
* @return
*/
@Override
- public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId) {
+ public Map<String, Object> allListByUser(ArdSyUser ardSyUser, String syURL, String usersId, List<Long> deptList) {
Map<String, Object> result0 = new HashMap();
//鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
if (ardSyUser != null) {
@@ -497,10 +565,29 @@
map.put("list", new ArrayList());
return map;
}
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id", deptList);
+ List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
int online = 0;
for (Map<String, Object> map : (List<Map<String, Object>>) result0.get("list")) {
Map<String, Object> resultMap = sYClient.getTeamCarList(syURL, (String) map.get("teamId"), result.get("sessionId"));
List<Map<String, Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
+ if(carList.size()>0){
+ for (int i = 0; i < carList.size(); i++) {
+ String carId = (String) carList.get(i).get("carId");
+ Boolean isCar = false;
+ for (int j = 0; j < carListTable.size(); j++) {
+ ArdSyCar ardSyCar = carListTable.get(j);
+ if (carId.equals(ardSyCar.getCarId())) {
+ isCar = true;
+ break;
+ }
+ }
+ if(!isCar){
+ carList.remove(carList.get(i));
+ }
+ }
+ }
for (Map<String, Object> m : carList) {
if (((String) m.get("stateCn")).contains("鍦ㄧ嚎")) {
online = online + 1;
@@ -508,11 +595,12 @@
continue;
}
}
- for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
- if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
- map.put("count", Integer.parseInt((String) m.get("carNum")));
- }
- }
+// for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
+// if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
+// map.put("count", Integer.parseInt((String) m.get("carNum")));
+// }
+// }
+ map.put("count", carList.size());
map.put("online", online);
online = 0;
}
@@ -616,23 +704,29 @@
queryWrapper.in("dept_id", deptList);
List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
//瀵规瘮鎶婂尮閰嶅埌鐨勬暟鎹坊鍔犲埌list涓�
- for (Map<String, String> m : list) {
- String carId = m.get("carId");
- for (int i = 0; i < carList.size(); i++) {
- ArdSyCar ardSyCar = carList.get(i);
+ for (int i = 0; i < list.size(); i++) {
+ String carId = list.get(i).get("carId");
+ Boolean isCar = false;
+ for (int j = 0; j < carList.size(); j++) {
+ ArdSyCar ardSyCar = carList.get(j);
if (carId.equals(ardSyCar.getCarId())) {
- String url = "";
+ /*String url = "";
if (ardSyCar.getCarPicture() != null) {
if (!ardSyCar.getCarPicture().equals("")) {
url = ardSyCar.getCarPicture().split("sycar")[0];
}
- }
- m.put("carModel", url + ardSyCar.getCarModel());//zns
+ }*/
+ list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
//m.put("carModel",ardSyCar.getCarModel());
- m.put("carTypeArd", ardSyCar.getCarType());
- m.put("carBrand", ardSyCar.getCarBrand());
- m.put("carPicture", ardSyCar.getCarPicture());
+ list.get(i).put("carTypeArd", ardSyCar.getCarType());
+ list.get(i).put("carBrand", ardSyCar.getCarBrand());
+ list.get(i).put("carPicture", ardSyCar.getCarPicture());
+ isCar = true;
+ break;
}
+ }
+ if(!isCar){
+ list.remove(list.get(i));
}
}
return list;
@@ -775,20 +869,68 @@
}
@Override
- public Results getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
- Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ public Map<String, Object> getCarGPSBycarId(String usersId, String carId, String syURL, ArdSyUser ardSyUser) {
+// Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
//31鐢ㄦ埛鍚嶅瘑鐮�
String username31 = ardSyUser.getUserId();
String password31 = ardSyUser.getPassword();
String passwordMd5 = DigestUtils.md5Hex(password31);
Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
- result = new HashMap();
+ Map<String, String> result = new HashMap();
result.put("userId", username31);
result.put("sessionId", (String) result1.get("sessionId"));
- Map<String, Object> result0 = new HashMap();
- result0 = sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
- return Results.succeed(result0);
+ return sYClient.getCarNearPositionByCarId(syURL, carId, result.get("userId"), result.get("sessionId"));
}
+
+ @Override
+ public Map<String, Object> getCarPicture(String carId, String syURL, String sessionId) {
+ return sYClient.getCarPicture(syURL, carId, sessionId);
+ }
+
+ @Override
+ public String getSessionId(String syURL,ArdSyUser ardSyUser) {
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ String passwordMd5 = DigestUtils.md5Hex(password31);
+ System.out.println(passwordMd5);
+ Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
+ return (String) result1.get("sessionId");
+ }
+
+ @Override
+ public Map<String, Object> sendCmd(String userId,String syURL, String sessionId, String carId, List<String> channelList) throws UnsupportedEncodingException {
+// for (int i = 0; i < channelList.size(); i++) {
+ Map<String,String> params = new HashMap();
+ params.put("channel", channelList.get(1));//閫夋嫨閫氶亾1
+ params.put("interval", "0");//姣忛殧0s鐓т竴娆�
+ params.put("photoNum", "1");//鐓�1寮�
+ params.put("action", "0");//涓婁紶妯″紡
+ String paramsStr = com.alibaba.fastjson2.JSON.toJSONString(params);
+ paramsStr = URLEncoder.encode(paramsStr,"UTF-8");
+ System.out.println("鎷嶇収鍙傛暟锛�"+paramsStr);
+ return sYClient.sendCmd(syURL,userId,carId,301,"MediaTake",paramsStr,sessionId);
+// }
+// return sendCmdMap;
+ }
+
+ @Override
+ public Map<String, Object> getPhoto(String syURL, String carId, String sessionId,String startTime) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ String endTime = sdf.format(new Date());
+ System.out.println("寮�濮嬫椂闂达細"+startTime+" 缁撴潫鏃堕棿锛�"+endTime);
+ return sYClient.getPhoto(syURL,carId,startTime,endTime,sessionId);
+ }
+
+ @Override
+ public Map<String, Object> getVideo(String syURL,String carId,ArdSyUser ardSyUser) {
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ String password = DigestUtils.md5Hex(password31);
+// Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
+ return sYClient.getVideo(syURL,username,password,"榛慐12401",1);
+ }
+
@Override
public Results chaseCarByCarId(String usersId, String carId, String cycle) {
@@ -1086,7 +1228,7 @@
List<Map<String, Object>> carGPSMap = (List<Map<String, Object>>) carGPSTrack.get("list");
Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
- double distance = GisTool.getDistance( new double[]{longitude,latitude}, new double[]{lng, lat});
+ double distance = GisUtil.getDistance( new double[]{longitude,latitude}, new double[]{lng, lat});
if (distance <= radius) {
carMap.put("longitude",lng);
carMap.put("latitude",lat);
@@ -1145,7 +1287,7 @@
Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
Point point = new Point(lng,lat);
- boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);
+ boolean inPolygon = GisUtil.isInPolygon(point, partitionLocation);
if (inPolygon) {
carMap.put("longitude", lng);
carMap.put("latitude", lat);
@@ -1159,4 +1301,95 @@
}
return filteredList;
}
+
+ @Override
+ public List<ArdSyCar> all() {
+ QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("reserved_1","");
+ return ardSyCarMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public Map<String, Object> getAlarmHPfmCountDetail(String sessionId, String usersId, String carId, String startTime, String endTime, String syURL) {
+// System.out.println("sessionId------"+sessionId+",usersId-----"+usersId+",carId-----"+carId+",startTime----"+startTime+",endTime----"+endTime+",syURL----"+syURL);
+ return sYClient.getAlarmHPfmCountDetail(syURL,carId,sessionId,startTime,endTime);
+ }
+
+ @Override
+ public Map<String, Object> getOnlineSYCarPosition(String soilderId) {
+ Map<String,Object> result = new HashMap();
+ ArdSyUser ardSyUserPara = new ArdSyUser();
+ ardSyUserPara.setSysUserId(soilderId);
+ List<ArdSyUser> ardSyUserList = ardSyUserMapper.selectArdSyUserList(ardSyUserPara);
+ if(ardSyUserList.size() == 0){
+ result.put("code","0");
+ result.put("msg","鐧诲綍鐢ㄦ埛鏈寕鎺ヤ笁涓�杞﹁締璐﹀彿");
+ result.put("SYCarPositionList",new ArrayList());
+ return result;
+ }
+ ArdAppApplication ardAppApplicationPara = new ArdAppApplication();
+ ardAppApplicationPara.setSoilderId(soilderId);
+ ardAppApplicationPara.setApplicationType("SYCar");
+ ardAppApplicationPara.setState("1");
+ List<ArdAppApplication> ardAppApplicationList = ardAppApplicationMapper.selectArdAppApplicationList(ardAppApplicationPara);
+ if(ardAppApplicationList.size() == 0){
+ result.put("code","0");
+ result.put("msg","鐧诲綍鐢ㄦ埛鏈粡鎸囨尌绔悓鎰�");
+ result.put("SYCarPositionList",new ArrayList());
+ return result;
+ }
+ SysUser sysUser = userMapper.selectUserById(soilderId);//鑾峰彇绯荤粺鐢ㄦ埛
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.add(sysUser.getDeptId());
+ deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//閫掑綊鏌ヨ涓嬪睘閮ㄩ棬涓婚敭
+ List<String> carIdList = ardSyCarMapper.selectArdSyCarByDeptIds(deptIdList);
+ String carIds = "";
+ for(String carId : carIdList){
+ carIds = carIds + carId + ",";
+ }
+ carIds = carIds.substring(0,carIds.length() - 1);
+ String syURL = "";
+ List<SysConfig> sysConfigResult = sysConfigMapper.selectByType("syCarPT");
+ if(sysConfigResult.size() > 0){
+ syURL = sysConfigResult.get(0).getConfigValue();
+ }else{
+ result.put("code","0");
+ result.put("msg","涓変竴杞﹁締url娌℃湁褰曞叆");
+ result.put("SYCarPositionList",new ArrayList());
+ return result;
+ }
+ String passwordMd5 = DigestUtils.md5Hex(ardSyUserList.get(0).getPassword());
+ Map<String,Object> syLoginResult = sYClient.logIn(syURL, passwordMd5, ardSyUserList.get(0).getUserId());
+ String sessionId = (String) syLoginResult.get("sessionId");
+ Map<String,Object> carNearPositionResult = sYClient.getCarNearPositionByCarId(syURL, carIds, ardSyUserList.get(0).getUserId(),sessionId);
+ if(((String)carNearPositionResult.get("rspCode")).equals("1")){
+ result.put("code","1");
+ result.put("msg","涓変竴杞﹁締鏌ヨ鎴愬姛");
+ List<Map<String,Object>> SYCarPositionList = (List<Map<String, Object>>) carNearPositionResult.get("list");
+ //绛涢�夊湪绾�
+ SYCarPositionList = SYCarPositionList.stream().filter(map -> ((String)map.get("stateCn")).startsWith("鍦ㄧ嚎")).collect(Collectors.toList());
+ for(Map<String,Object> sycar : SYCarPositionList){
+ Map<String,Object> map = ardSyCarMapper.getArdSyCarAndDeptByCarId((String)sycar.get("carId"));
+ sycar.putAll(map);
+ }
+ result.put("SYCarPositionList",SYCarPositionList);
+ return result;
+ }else{
+ result.put("code","0");
+ result.put("msg","涓変竴杞﹁締鏌ヨ澶辫触");
+ result.put("SYCarPositionList",new ArrayList());
+ return result;
+ }
+ }
+
+ public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
+ deptIdListr.addAll(deptIdList);
+ List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
+ if(result.size() != 0){
+ deptIdListr.addAll(result);
+ result = getOwnAndChildrenDeptIdList(result,deptIdListr);
+ }
+ deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
+ return deptIdListr;
+ }
}
--
Gitblit v1.9.3