Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 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;

/**
 * 井管理Service接口
@@ -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);
}