三一车辆遗漏提交

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;
    }
@@ -718,7 +736,11 @@
        Map<String, Object> result1 = sYClient.logIn(syURL, passwordMd5, username31);
        Map<String, Object> result0 = new HashMap();
        //result0 = sYClient.getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
        result0 = getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
        try {
            result0 = getCarGPSTrack(syURL, carId, startTime, endTime, maxSpeed, (String) result1.get("sessionId"));
        } catch (Exception e) {
            return Results.error("查询历史数据数量过多导致超时，请缩小范围查询！");
        }
        List<Map<String, Object>> list = (List<Map<String, Object>>) result0.get("list");
        if (list.isEmpty()) {
            return Results.succeed();
@@ -1313,62 +1335,70 @@
     */
    @Override
    public List<Map<String, Object>> getNearCar(SchedulingParam param) {
        Double longitude = param.getLongitude();
        Double latitude = param.getLatitude();
        Integer radius = param.getSealingRadius();
        if (longitude == null && latitude == null) {
            log.debug("原点坐标为空");
            return null;
        }
        if (radius == null) {
            log.debug("半径距离为空");
            return null;
        }
        String userId = SecurityUtils.getUserId();
        ArdSyUser syUser = new ArdSyUser();
        syUser.setSysUserId(userId);
        List<ArdSyUser> ardSyUserList = ardSyUserMapper.selectArdSyUserList(syUser);
        if (ardSyUserList.size() == 0) {
            log.debug("用户未挂接三一车辆");
            return null;
        }
        ArdSyUser ardSyUser = ardSyUserList.get(0);
        String syUrl = redisCache.getCacheObject("sys_config:syCarPT");
        String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
        Map<String, Object> LogInResult = sYClient.logIn(syUrl, passwordMd5, ardSyUser.getUserId());
        String sessionId = (String) LogInResult.get("sessionId");
        try {
            Double longitude = param.getLongitude();
            Double latitude = param.getLatitude();
            Integer radius = param.getSealingRadius();
            if (longitude == null && latitude == null) {
                log.debug("原点坐标为空");
                return null;
            }
            if (radius == null) {
                log.debug("半径距离为空");
                return null;
            }
            String userId = SecurityUtils.getUserId();
            ArdSyUser syUser = new ArdSyUser();
            syUser.setSysUserId(userId);
            List<ArdSyUser> ardSyUserList = ardSyUserMapper.selectArdSyUserList(syUser);
            if (ardSyUserList.size() == 0) {
                log.debug("用户未挂接三一车辆");
                return null;
            }
            ArdSyUser ardSyUser = ardSyUserList.get(0);
            String syUrl = redisCache.getCacheObject("sys_config:syCarPT");
            String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
            Map<String, Object> LogInResult = sYClient.logIn(syUrl, passwordMd5, ardSyUser.getUserId());
            String sessionId = (String) LogInResult.get("sessionId");

        Map<String, Object> teamList = sYClient.getTeamList(syUrl, ardSyUser.getUserId(), sessionId);
        List<Map<String, Object>> listMap = (List<Map<String, Object>>) teamList.get("list");
        List<Map<String, Object>> allList = new ArrayList<>();
        for (Map<String, Object> team : listMap) {
            String teamId = (String) team.get("teamId");
            Map<String, Object> carListMap = sYClient.getCarList1(syUrl, teamId, ardSyUser.getUserId(), sessionId);
            if (((String) carListMap.get("rspCode")).equals("1")) {
                List<Map<String, Object>> list = (List<Map<String, Object>>) carListMap.get("list");
                allList.addAll(list);
            Map<String, Object> teamList = sYClient.getTeamList(syUrl, ardSyUser.getUserId(), sessionId);
            List<Map<String, Object>> listMap = (List<Map<String, Object>>) teamList.get("list");
            List<Map<String, Object>> allList = new ArrayList<>();
            for (Map<String, Object> team : listMap) {
                String teamId = (String) team.get("teamId");
                Map<String, Object> carListMap = sYClient.getCarList1(syUrl, teamId, ardSyUser.getUserId(), sessionId);
                if (((String) carListMap.get("rspCode")).equals("1")) {
                    List<Map<String, Object>> list = (List<Map<String, Object>>) carListMap.get("list");
                    allList.addAll(list);
                }
            }
        }
        //过滤在线车辆
        List<Map<String, Object>> onlineList = allList.stream()
                .filter(map -> !"离线".equals(map.get("stateCn")))
                .collect(Collectors.toList());
        List<Map<String, Object>> filteredList = new ArrayList<>();
        //过滤半径
        for (Map<String, Object> carMap : onlineList) {
            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); // 将满足条件的车辆添加到筛选列表中
            //过滤在线车辆
            List<Map<String, Object>> onlineList = allList.stream()
                    .filter(map -> !"离线".equals(map.get("stateCn")))
                    .collect(Collectors.toList());
            List<Map<String, Object>> filteredList = new ArrayList<>();
            //过滤半径
            for (Map<String, Object> carMap : onlineList) {
                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");
                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;
        }catch (Exception e)
        {
           log.error("获取附近范围内的车辆信息异常:"+e.getMessage());
            return null;
        }
        return filteredList;
    }
    /**
     * 获取范围内的车辆信息(多边形)