From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/MonitorPointService.java | 15 +++++++++++++--
1 files changed, 13 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..4328dc4 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -9,14 +9,25 @@
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);
+
+ List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+ List<Integer> queryVersionsById(Integer id);
+
+ MonitorPoint queryMonitorPointById(Integer mpointId);
}
--
Gitblit v1.8.0