From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/MonitorPointService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 7860a85..4328dc4 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -3,10 +3,31 @@
 import java.util.List;
 import java.util.Map;
 
+import com.moral.common.bean.PageBean;
 import com.moral.entity.MonitorPoint;
 
 public interface MonitorPointService {
 
 	List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
 
+    List<MonitorPoint> queryWithStateByMap(Map<String, Object> params);
+
+    public PageBean queryByPageBean(PageBean pageBean);
+
+    MonitorPoint queryWithRelationById(Integer id);
+
+    public void addOrModify(MonitorPoint monitorPoint);
+
+	public void deleteByIds(Integer... ids);
+	
+	List<MonitorPoint> getMonitorPointsByName(String name);
+    List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
+
+	List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+
+	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+    List<Integer> queryVersionsById(Integer id);
+
+    MonitorPoint queryMonitorPointById(Integer mpointId);
 }

--
Gitblit v1.8.0