From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/MonitorPointMapper.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index ae3420d..a39c5d6 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -2,15 +2,52 @@
 
 import java.util.List;
 import java.util.Map;
+
+import com.moral.entity.Device;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.MonitorPoint;
+
 import tk.mybatis.mapper.entity.Example;
 
-public interface MonitorPointMapper extends BaseMapper<MonitorPoint>{
-	List<MonitorPoint> selectWithAreaNameByExample(Example example);
-	List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
+public interface MonitorPointMapper extends BaseMapper<MonitorPoint> {
+    List<MonitorPoint> selectWithAreaNameByExample(Example example);
+
+    List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
+
     List<MonitorPoint> selectByMap(Map<String, Object> params);
+
     List<Integer> selectOrganizationIds(int id);
+
     List<Integer> selectVersionsById(int id);
+
     Map<String, Object> selectAllById(int id);
+
+    List<Map<String, Object>> getIdByOrganizationId(@Param("organizationIdList") List<Object> organizationIdList);
+
+    //������monitorPointId������������������������������������
+    List<Device> getDeviceList(@Param("id") int id);
+
+    //���������������������������id
+    MonitorPoint getMonitorPointById(@Param("id") int id);
+
+    List<MonitorPoint> getMonitorPointListByAccountId(@Param("id") int id);
+
+    MonitorPoint byIdGetMonitorPoint(@Param("id") int id);
+
+    MonitorPoint getFirstMonitorPointByAreaCode(@Param("areaCode") int areaCode);
+
+    MonitorPoint getFirstMonitorPointByCityCode(@Param("cityCode") int cityCode);
+
+    MonitorPoint getFirstMonitorPointByProvinceCode(@Param("provinceCode") int provinceCode);
+
+    List<Integer> getMonitorPointIds(Map<String, Object> params);
+
+    List<MonitorPoint> byCodeGetMonitor(Map<String, Object> params);
+
+    String getOrgIdByMac(String mac);
+
+    String getMonitorName(int mpId);
 }
\ No newline at end of file

--
Gitblit v1.8.0