From 9ea24035a5a3c8c5a99551a075d47aa26eadbcaf Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 14 Jun 2019 10:28:05 +0800
Subject: [PATCH] 修改单位返回格式

---
 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 20c8d03..9b932f8 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -311,7 +311,9 @@
 	@Override
 	public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
 		convertQueryParam(parameters);
-
+		if (!ObjectUtils.isEmpty(parameters.get("compensate"))) {
+			parameters.put("timeUnits", "10min");
+		}
 		return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
 	}
 

--
Gitblit v1.8.0