From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/MonitorPointMapper.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/mapper/MonitorPointMapper.java b/src/main/java/com/moral/mapper/MonitorPointMapper.java
index e61a63d..112fd4d 100644
--- a/src/main/java/com/moral/mapper/MonitorPointMapper.java
+++ b/src/main/java/com/moral/mapper/MonitorPointMapper.java
@@ -2,29 +2,41 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
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 byIdGetMonitorPoint(@Param("id") int id);
MonitorPoint getFirstMonitorPointByAreaCode(@Param("areaCode") int areaCode);
@@ -32,5 +44,13 @@
MonitorPoint getFirstMonitorPointByProvinceCode(@Param("provinceCode") int provinceCode);
- List<MonitorPoint> getMonitorList(Map<String, Object> params);
+ List<Integer> getMonitorPointIds(Map<String, Object> params);
+
+ List<MonitorPoint> byCodeGetMonitor(Map<String, Object> params);
+
+ String getOrgIdByMac(String mac);
+
+ String getMonitorName(int mpId);
+
+ List<MonitorPoint> getMonitorPointsByOrganizationIds(@Param("orgIds") Set<Integer> orgIds);
}
\ No newline at end of file
--
Gitblit v1.8.0