优化：获取会话

liusuyi

2024-08-08 57c673aa3e83677bcf5d30b4b45d06bae6609db8

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

@@ -134,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");
@@ -547,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"));
@@ -695,9 +700,14 @@
     */
    @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");
@@ -1543,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);