From 6006fe5d31237a7b45214b81069c17c2d155e9fb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 22 May 2018 09:37:14 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 4058715..648b3cc 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -44,6 +44,7 @@
import com.moral.entity.charts.DataCondition;
import com.moral.entity.charts.LineChartCriteria;
import com.moral.entity.charts.TimePeriod;
+import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.AlarmMapper;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMinutelyMapper;
@@ -64,7 +65,7 @@
private SensorMapper sensorMapper;
@Resource
- private AlarmMapper alarmMapper;
+ private AlarmDailyMapper alarmDailyMapper;
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
@@ -208,8 +209,11 @@
Map<String, BigDecimal> mapData = (Map<String, BigDecimal>) obj;
BigDecimal sum = mapData.remove("sum");
for (Entry<String, BigDecimal> entry : mapData.entrySet()) {
- sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())
- .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+ if (!"name".equals(entry.getKey())) {
+ sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())
+ .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+ }
}
}
break;
@@ -287,7 +291,7 @@
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, alarmMapper.getAlarmData(parameters).get(0));
+ resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
}
return resultMap;
}
--
Gitblit v1.8.0