From 06842b9c367083c3bf77b8b54a1e1a32b68a2e5e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 09:02:33 +0800
Subject: [PATCH] 电磁锁分页bug修改提交
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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..dc09728 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,23 +1,25 @@
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鎺ュ彛
- *
+ *
* @author 鍒樿嫃涔�
* @date 2023-03-07
*/
-public interface IArdAlarmpointsWellService
+public interface IArdAlarmpointsWellService
{
/**
* 鏌ヨ浜曠鐞�
- *
+ *
* @param id 浜曠鐞嗕富閿�
* @return 浜曠鐞�
*/
@@ -31,7 +33,7 @@
public ArdAlarmpointsWell selectArdAlarmpointsWellByWellId(String wellId);
/**
* 鏌ヨ浜曠鐞嗗垪琛�
- *
+ *
* @param ardAlarmpointsWell 浜曠鐞�
* @return 浜曠鐞嗛泦鍚�
*/
@@ -47,7 +49,7 @@
/**
* 鏂板浜曠鐞�
- *
+ *
* @param ardAlarmpointsWell 浜曠鐞�
* @return 缁撴灉
*/
@@ -55,15 +57,21 @@
/**
* 淇敼浜曠鐞�
- *
+ *
* @param ardAlarmpointsWell 浜曠鐞�
* @return 缁撴灉
*/
public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell);
-
+ /**
+ * 淇敼浜曠鐞嗘寜浜曞彿
+ *
+ * @param ardAlarmpointsWell 浜曠鐞�
+ * @return 缁撴灉
+ */
+ public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell);
/**
* 鎵归噺鍒犻櫎浜曠鐞�
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑浜曠鐞嗕富閿泦鍚�
* @return 缁撴灉
*/
@@ -71,7 +79,7 @@
/**
* 鍒犻櫎浜曠鐞嗕俊鎭�
- *
+ *
* @param id 浜曠鐞嗕富閿�
* @return 缁撴灉
*/
@@ -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,22 @@
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);
+
+ List<Map<String,Object>> getCameraVideoLable(Long deptId,String cameraId,Float p,Float t,Float fHorFieldAngle,Float fVerFieldAngle);
}
--
Gitblit v1.9.3