From e97c393e23f4c015a44b5fef5fd26ae288bc6c0f Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 10 Jul 2019 11:31:35 +0800
Subject: [PATCH] 天气预报
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 07679a4..9b932f8 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -37,6 +37,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.moral.common.util.CalculateUtils;
+import com.moral.common.util.ParameterUtils;
import com.moral.common.util.ReportTimeFormat;
import com.moral.common.util.ResourceUtil;
import com.moral.common.util.ValidateUtil;
@@ -139,7 +140,8 @@
List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});
String type = (String) parameters.get("type");
- parameters.putAll(getElementByType(type));
+ // parameters.putAll(getElementByType(type));
+ ParameterUtils.getElementByType(parameters);
Integer timeLength = Integer.valueOf(parameters.remove("timeLength").toString());
if ("month".equals(type)) {
for (Map<String, Object> map : list) {
@@ -298,7 +300,10 @@
Object type = parameters.get("type");
if ("year".equals(type) || "month".equals(type)) {
parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
- resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+ List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
+ if (!ObjectUtils.isEmpty(alarmData)) {
+ resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+ }
}
return resultMap;
}
@@ -306,15 +311,18 @@
@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);
}
@Override
public void convertQueryParam(Map<String, Object> parameters) throws ParseException {
- String type = (String) parameters.get("type");
if (!parameters.containsKey("field")) {
- parameters.putAll(getElementByType(type));
+ // String type = (String) parameters.get("type");
+ // parameters.putAll(getElementByType(type));
+ ParameterUtils.getElementByType(parameters);
}
String time = (String) parameters.get("time");
String format = (String) parameters.get("format");
--
Gitblit v1.8.0