From 86a4c7ca3512cbe8b8d5cf9479174bfceead10db Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 27 九月 2023 11:09:32 +0800
Subject: [PATCH] 优化获取附近井接口

---
 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index 7b20289..89acfd4 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -296,20 +296,22 @@
     }
 
     @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);
-            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});
-                        if (distance <= range) {
-                            nearbyWellList.add(well);
+            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(new Double[]{longitudeCenter, latitudeCenter}, new Double[]{longitude, latitude});
+                            if (distance <= range) {
+                                nearbyWellList.add(well);
+                            }
                         }
                     }
                 }

--
Gitblit v1.9.3