From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
index 364225f..ae2d433 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
@@ -60,7 +60,13 @@
* @return 缁撴灉
*/
public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell);
-
+ /**
+ * 淇敼浜曠鐞嗘寜浜曞彿
+ *
+ * @param ardAlarmpointsWell 浜曠鐞�
+ * @return 缁撴灉
+ */
+ public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell);
/**
* 鎵归噺鍒犻櫎浜曠鐞�
*
@@ -84,7 +90,7 @@
* @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
- public String importUser(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName);
+ public String importWell(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName);
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
*
@@ -122,5 +128,5 @@
* 鍒樿嫃涔�
* 2023/9/27 10:26:35
*/
- List<ArdAlarmpointsWell> getNearbyWellList(ArdAlarmpointsWell ardAlarmpointsWell,Integer range);
+ List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter,Double latitudeCenter, Long deptId,Integer range);
}
--
Gitblit v1.9.3