Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java

@@ -164,4 +164,30 @@
        return R.ok(convenientElevatingPointVOS);

    }

    @Override
    public R findPointNumByDistance(Integer distance, String lat, String lng) {
        Map<Object, Object> around = MapDistance.getAround(lat, lng, distance * 1000d);
        String maxLat = around.get("maxLat").toString();
        String minLat = around.get("minLat").toString();
        String minLng = around.get("minLng").toString();
        String maxLng = around.get("maxLng").toString();
        List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
                new LambdaQueryWrapper<ConvenientElevatingPointDO>()
                        .ge(ConvenientElevatingPointDO::getLat, minLng)
                        .le(ConvenientElevatingPointDO::getLat, maxLng)
                        .ge(ConvenientElevatingPointDO::getLon, minLat)
                        .le(ConvenientElevatingPointDO::getLon, maxLat)
                        .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
        List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
        convenientElevatingPointDOS.forEach(f -> {
            ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
            BeanUtils.copyProperties(f, convenientElevatingPointVO);
            Double distancem = MapDistance.distanceOfTwoPoints(lat, lng, f.getLon(), f.getLat());
            convenientElevatingPointVO.setDistance(distancem);
            convenientElevatingPointVOS.add(convenientElevatingPointVO);
        });
        Collections.sort(convenientElevatingPointVOS);
        return R.ok(convenientElevatingPointVOS.size());
    }
}