From 0d667ba939460c3dc6cdb0c974841bd0be5dc432 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Dec 2020 13:41:56 +0800
Subject: [PATCH] report_avg_datas接口更新
---
src/main/java/com/moral/service/MonitorPointService.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 268b7c3..dddd7e1 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -3,9 +3,13 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.PageBean;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
+import org.apache.xmlbeans.impl.jam.mutable.MPackage;
public interface MonitorPointService {
@@ -28,7 +32,11 @@
List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+ List<MonitorPoint> getMonitorPointsByOrganizationIds(Set<Integer> orgIds);
+
List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+ List<MonitorPoint> getMonitorPointsAndDevicesByRegionNew(Map<String, Object> parameters);
List<Integer> queryVersionsById(Integer id);
@@ -41,4 +49,18 @@
void isCompensateCalculation(Map<String, Object> parameters);
Map<String, Object> selectAllById(String id);
+
+ //������monitorPointId������������������������������������
+ List<Device> getDeviceList(int id);
+
+ //���������������������������id
+ JSONObject getMonitorPointById(int id, String Time, int i, String sensor);
+
+ JSONObject getMacList(int id);
+
+ List<MonitorPoint> getMonitorPointListByAccountId(int id);
+
+ MonitorPoint byIdGetMonitorPoint(int id);
+
+ String getOrgIdByMac(String mac);
}
--
Gitblit v1.8.0