From f28149d8183a62f87fa9c8df9ae589070d83f612 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 24 Dec 2020 13:47:50 +0800
Subject: [PATCH] 波动补偿

---
 src/main/java/com/moral/service/MonitorPointService.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 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..dddd7e1 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -1,22 +1,66 @@
 package com.moral.service;
 
+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 {
 
 	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> getMonitorPointsByOrganizationIds(Set<Integer> orgIds);
+
+	List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+    List<MonitorPoint> getMonitorPointsAndDevicesByRegionNew(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