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 | 138 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 138 insertions(+), 0 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 774ea33..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
@@ -15,11 +15,20 @@
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.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;
@@ -84,6 +93,12 @@
@Resource
private ArdSyCarDayMapper ardSyCarDayMapper;
+ @Resource
+ private ArdAppApplicationMapper ardAppApplicationMapper;
+
+ @Resource
+ private SysDeptMapper sysDeptMapper;
+
@Value("${minio.endpoint}")
private String minioEndpoint;
@@ -111,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));
+ }
}
/**
@@ -1254,4 +1315,81 @@
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