From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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 747dff2..62c34fe 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
@@ -1,11 +1,13 @@
package com.ruoyi.alarmpoints.well.service;
import java.util.List;
+import java.util.Map;
import com.github.pagehelper.PageInfo;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellDeptVo;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
+import com.ruoyi.common.core.domain.entity.SysConfig;
/**
* 浜曠鐞哠ervice鎺ュ彛
@@ -60,7 +62,13 @@
* @return 缁撴灉
*/
public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell);
-
+ /**
+ * 淇敼浜曠鐞嗘寜浜曞彿
+ *
+ * @param ardAlarmpointsWell 浜曠鐞�
+ * @return 缁撴灉
+ */
+ public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell);
/**
* 鎵归噺鍒犻櫎浜曠鐞�
*
@@ -84,7 +92,7 @@
* @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
- public String importUser(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName);
+ public String importWell(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName);
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
*
@@ -102,7 +110,7 @@
/**
* 鏍稿浜曞彿鏄惁鍞竴
*
- * @param id 闇�瑕佹牳瀵圭殑浜曠殑涓婚敭
+ * @param well 闇�瑕佹牳瀵圭殑浜�
* @return 缁撴灉
*/
@@ -117,5 +125,20 @@
PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
List<ArdAlarmpointsWellDeptVo> wellListDept(List<Long> deptList);
+ /**
+ * 鑾峰彇闄勮繎鐨勪簳
+ * 鍒樿嫃涔�
+ * 2023/9/27 10:26:35
+ */
+ List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter,Double latitudeCenter, Long deptId,Integer range);
+
+ /**
+ * 鏌ヨ娌逛簳鍔ㄩ潤鎬佹暟鎹�
+ */
+ Map<String,Object> getWellDataByWellId(String wellId, List<SysConfig> config);
+
+ Map<String,Object> getWellDataByPatrolplanIdAndPosition(Map<String,Object> para,List<SysConfig> sysConfigResult);
+
+ ArdAlarmpointsWell getWellById(String id);
}
--
Gitblit v1.9.3