From 169dbfb17843ba9bf57edc9e687555ab0351e7a0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 25 Apr 2018 10:31:29 +0800
Subject: [PATCH] 饼图 功能
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index 8b2e03c..3d56965 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -28,33 +28,56 @@
@Override
public Map getPieData(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try {
historyMinutelyService.convertQueryParam(parameters);
} catch (ParseException e) {
e.printStackTrace();
}
List<Map<String, Object>> alarmDatas = alarmMapper.getAlarmData(parameters);
- Map<String, List> resultMap = new LinkedHashMap<String, List>();
- for (Map<String, Object> alarmData : alarmDatas) {
- String name = alarmData.remove("name").toString();
- alarmData.remove("sum");
- for (Map.Entry<String, Object> entry : alarmData.entrySet()) {
- String key = entry.getKey();
- Object value = entry.getValue().toString();
- if (!"0".equals(value)) {
- List list;
- Map<String, Object> map = new HashMap<String, Object>();
- if (ObjectUtils.isEmpty(resultMap.get(key))) {
- list = new ArrayList();
- } else {
- list = resultMap.get(key);
+ Object dimension = parameters.get("dimension");
+ if ("monitorPoint".equals(dimension)) {
+ for (Map<String, Object> alarmData : alarmDatas) {
+ String name = alarmData.remove("name").toString();
+ alarmData.remove("sum");
+ for (Map.Entry<String, Object> entry : alarmData.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue().toString();
+ if (!"0".equals(value)) {
+ List list;
+ Map<String, Object> map = new HashMap<String, Object>();
+ if (ObjectUtils.isEmpty(resultMap.get(key))) {
+ list = new ArrayList();
+ } else {
+ list = (List) resultMap.get(key);
+ }
+ map.put("name", name);
+ map.put("value", value);
+ list.add(map);
+ resultMap.put(key, list);
}
- map.put("name", name);
- map.put("value", value);
- list.add(map);
- resultMap.put(key, list);
}
}
+ } else {
+ Map<String, Object> alarmData = alarmDatas.get(0);
+ List<String> sensors = (List<String>) parameters.get("sensors");
+ List list = new ArrayList();
+ for (String key : alarmData.keySet()) {
+ for (String sensor : sensors) {
+ String[] split = sensor.split("-");
+ if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ if (parameters.containsKey("description")) {
+ map.put("name", split[3]);
+ } else {
+ map.put("name", split[1]);
+ }
+ map.put("value", alarmData.get(key));
+ list.add(map);
+ }
+ }
+ }
+ resultMap.put("list", list);
}
return resultMap;
}
--
Gitblit v1.8.0