From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/service/MonitorPointService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index b036d89..aa9cef8 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -9,14 +9,19 @@
public interface MonitorPointService {
List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
- public PageBean queryByPageBean(PageBean pageBean);
- MonitorPoint selectWithRelationById(Integer id);
+ 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);
}
--
Gitblit v1.8.0