From bda6cd23ba9af8a09ec5e4202ce4fafb1933c39a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 三月 2024 14:59:56 +0800
Subject: [PATCH] 修改参加活动金汇币明细报错4
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
index a2d66ac..8a090d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -147,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 -> {
@@ -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, 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());
+ }
}
--
Gitblit v1.7.1