From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题

---
 src/main/java/com/moral/service/MonitorPointService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 4328dc4..268b7c3 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -1,5 +1,6 @@
 package com.moral.service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -23,11 +24,21 @@
 	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);
 }

--
Gitblit v1.8.0