优化：获取会话

liusuyi

2024-08-08 57c673aa3e83677bcf5d30b4b45d06bae6609db8

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -26,6 +26,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.mapper.ArdTankLockMapper;
import com.ruoyi.sy.param.ArdSyCarParam;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.system.mapper.SysDeptMapper;
@@ -99,6 +100,9 @@
    @Resource
    private SysDeptMapper sysDeptMapper;

    @Resource
    private ArdTankLockMapper ardTankLockMapper;

    @Value("${minio.endpoint}")
    private String minioEndpoint;

@@ -130,10 +134,11 @@

    @Override
    public AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        /*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<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);*/
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectByBrandAndType(ardSyCarParam.getCarBrand(),ardSyCarParam.getCarType());
        List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
        if(((String)result.get("code")).equals("200")){
            List<Map<String,Object>> list = (List<Map<String, Object>>) result.get("data");
@@ -212,7 +217,16 @@
            }
        }
        MinioUtil.removeObjects("sycar", objectNames);
        return ardSyCarMapper.deleteArdSyCarByIds(ids);
        try{
            return ardSyCarMapper.deleteArdSyCarByIds(ids);
        }finally {
            List<String> carIds = new ArrayList();
            for(ArdSyCar ardSyCar : result){
                carIds.add(ardSyCar.getCarId());
            }
            ardTankLockMapper.deleteArdTankLockAndWallByCarIds(carIds);
        }

    }

    /**
@@ -534,9 +548,13 @@
                map.put("list", new ArrayList());
                return map;
            }
            QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
            /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
            queryWrapper.in("dept_id", deptList);
            List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);
            List<ArdSyCar> carListTable = ardSyCarMapper.selectList(queryWrapper);*/
            List<ArdSyCar> carListTable = new ArrayList();
            if(!deptList.isEmpty()){
                carListTable = ardSyCarMapper.getCarListByDeptIdList(deptList);
            }
            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"));
@@ -559,17 +577,30 @@
                }
                for (Map<String, Object> m : carList) {
                    if (((String) m.get("stateCn")).contains("在线")) {
                        online = online + 1;
                        String carId = (String) m.get("carId");
                        ArdSyCar ardSyCarQuery = new ArdSyCar();
                        ardSyCarQuery.setCarId(carId);
                        List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCarQuery);
                        if(ardSyCarList.size() != 0){
                            online = online + 1;
                        }else{
                            continue;
                        }
                    } else {
                        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")));
//                    }
//                }
                map.put("count", carList.size());
                List<String> carIdList = new ArrayList();//存放车队下全部车辆主键
                for(Map<String, Object> carMap : carList){
                    carIdList.add((String) carMap.get("carId"));
                }
                //map.put("count", carList.size());
                if(carIdList.size() == 0){
                    map.put("count", 0);
                }else{
                    Long count = ardSyCarMapper.getCountByCarIdList(carIdList);
                    map.put("count", count);
                }
                map.put("online", online);
                online = 0;
            }
@@ -669,35 +700,30 @@
     */
    @Override
    public List<Map<String, String>> carIdByDeptList(List<Long> deptList, List<Map<String, String>> list) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("dept_id", deptList);
        List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
        List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);*/
        List<ArdSyCar> carList = new ArrayList();
        if(!deptList.isEmpty()){
            carList = ardSyCarMapper.getCarListByDeptIdList(deptList);
        }

        //对比把匹配到的数据添加到list中
        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 = "";
                    if (ardSyCar.getCarPicture() != null) {
                        if (!ardSyCar.getCarPicture().equals("")) {
                            url = ardSyCar.getCarPicture().split("sycar")[0];
                        }
                    }*/
                    list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    //m.put("carModel",ardSyCar.getCarModel());
                    list.get(i).put("carTypeArd", ardSyCar.getCarType());
                    list.get(i).put("carBrand", ardSyCar.getCarBrand());
                    list.get(i).put("carPicture", ardSyCar.getCarPicture());
                    isCar = true;
                    list.get(i).put("deptId", ardSyCar.getDeptId());
                    break;
                }
            }
            if(!isCar){
                list.remove(list.get(i));
            }
        }
        list = list.stream().filter(map -> map.get("deptId") != null).collect(Collectors.toList());
        return list;
    }

@@ -1527,6 +1553,12 @@
        }
    }

    @Override
    public List<ArdSyCar> selectArdSyCarAndTankLock() {
        List<ArdSyCar> result = ardSyCarMapper.selectArdSyCarAndTankLock();
        return result;
    }

    public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
        deptIdListr.addAll(deptIdList);
        List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);