花城-智慧社区
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yanghui
2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11 
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java


@@ -22,10 +22,7 @@


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.util.ArrayList;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.*;




import static java.util.Objects.isNull;


import static java.util.Objects.nonNull;


@@ -150,10 +147,10 @@


        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)


                        .ge(ConvenientElevatingPointDO::getLat, Double.parseDouble(minLng))


                        .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))


                        .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))


                        .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(maxLat))


                        .eq(ConvenientElevatingPointDO::getBusinessStatus,1));


        List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();


        convenientElevatingPointDOS.forEach(f -> {


@@ -163,7 +160,34 @@


            convenientElevatingPointVO.setDistance(distance);


            convenientElevatingPointVOS.add(convenientElevatingPointVO);


        });


        Collections.sort(convenientElevatingPointVOS);


        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, Double.parseDouble(minLng))


                        .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))


                        .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))


                        .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(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());


    }


}