三一车辆遗漏提交

zhangnaisong

2024-07-20 55811ddff81bc142eac3c27e44f30c55e84311f1

 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;
@@ -98,6 +99,9 @@

    @Resource
    private SysDeptMapper sysDeptMapper;

    @Resource
    private ArdTankLockMapper ardTankLockMapper;

    @Value("${minio.endpoint}")
    private String minioEndpoint;
@@ -212,7 +216,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);
        }

    }

    /**
@@ -564,12 +577,17 @@
                        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;
            }
@@ -694,9 +712,9 @@
                    break;
                }
            }
            if(!isCar){
            /*if(!isCar){
                list.remove(list.get(i));
            }
            }*/
        }
        return list;
    }
@@ -1364,13 +1382,15 @@
                String carId = (String) carMap.get("carId");
                Map<String, Object> carGPSTrack = sYClient.getCarNearPositionByCarId(syUrl, carId, ardSyUser.getUserId(), sessionId);
                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 = GisUtil.getDistance(new double[]{longitude, latitude}, new double[]{lng, lat});
                if (distance <= radius) {
                    carMap.put("longitude", lng);
                    carMap.put("latitude", lat);
                    filteredList.add(carMap); // 将满足条件的车辆添加到筛选列表中
                if(carGPSMap.size()>0) {
                    Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
                    Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
                    double distance = GisUtil.getDistance(new double[]{longitude, latitude}, new double[]{lng, lat});
                    if (distance <= radius) {
                        carMap.put("longitude", lng);
                        carMap.put("latitude", lat);
                        filteredList.add(carMap); // 将满足条件的车辆添加到筛选列表中
                    }
                }
            }
            return filteredList;