From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/MonitorPointService.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 452a257..67c3774 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -1,10 +1,14 @@
package com.moral.service;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
+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 {
@@ -23,9 +27,35 @@
List<MonitorPoint> getMonitorPointsByName(String name);
List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
- List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+ 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);
+
+ List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters);
+
+ Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);
+
+ 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