From f28e4b29ec8e8d2246ef0c634661d1b062365d71 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期一, 29 一月 2024 15:28:28 +0800 Subject: [PATCH] 测试提交 --- ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 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 7651383..8c539e3 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,8 +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鎺ュ彛 @@ -57,7 +62,13 @@ * @return 缁撴灉 */ public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell); - + /** + * 淇敼浜曠鐞嗘寜浜曞彿 + * + * @param ardAlarmpointsWell 浜曠鐞� + * @return 缁撴灉 + */ + public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell); /** * 鎵归噺鍒犻櫎浜曠鐞� * @@ -81,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); /** * 鏍¢獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄� * @@ -96,5 +107,34 @@ */ public void checkWellAllowed(ArdAlarmpointsWell well); + /** + * 鏍稿浜曞彿鏄惁鍞竴 + * + * @param well 闇�瑕佹牳瀵圭殑浜� + * @return 缁撴灉 + */ + + public Boolean checkWellIdExists(ArdAlarmpointsWell well); + List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList); + + ArdAlarmpointsWell wellById(String id); + + List<ArdAlarmpointsWell> wellList(List<Long> deptList); + + 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); } -- Gitblit v1.9.3