‘liusuyi’
2023-09-27 86a4c7ca3512cbe8b8d5cf9479174bfceead10db
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -296,24 +296,26 @@
    }
    @Override
    public List<ArdAlarmpointsWell> getNearbyWellList(Long deptId, Double[] position, Integer range) {
    public List<ArdAlarmpointsWell> getNearbyWellList(ArdAlarmpointsWell ardAlarmpointsWell, Integer range) {
        List<ArdAlarmpointsWell> nearbyWellList = new ArrayList<>();
        try {
            ArdAlarmpointsWell ardAlarmpointsWell = new ArdAlarmpointsWell();
            ardAlarmpointsWell.setDeptId(deptId);
            Double longitudeCenter = ardAlarmpointsWell.getLongitude();
            Double latitudeCenter = ardAlarmpointsWell.getLatitude();
            if (longitudeCenter != null && latitudeCenter != null) {
            List<ArdAlarmpointsWell> ardAlarmpointsWells = ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(ardAlarmpointsWell);
            if (ardAlarmpointsWells.size() > 0) {
                for (ArdAlarmpointsWell well : ardAlarmpointsWells) {
                    Double longitude = well.getLongitude();
                    Double latitude = well.getLatitude();
                    if (longitude != null && latitude != null) {
                        double distance = GisUtil.getDistance(position, new Double[]{longitude, latitude});
                            double distance = GisUtil.getDistance(new Double[]{longitudeCenter, latitudeCenter}, new Double[]{longitude, latitude});
                        if (distance <= range) {
                            nearbyWellList.add(well);
                        }
                    }
                }
            }
            }
        } catch (Exception ex) {
            log.error("获取附近井异常:" + ex.getMessage());
        }