From 86916a5b7c8ed98221c03e440a9aad0f38109263 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/MonitorPointService.java | 17 +++++++++++++++--
1 files changed, 15 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..ad0afe4 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -9,14 +9,27 @@
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);
+ Integer countOfSubOrgs(Integer orgId);
+
+ 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