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           |    6 +++++-
 src/main/java/com/moral/controller/ReportController.java             |    1 -
 src/main/java/com/moral/controller/ScreenController.java             |    4 +++-
 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java |   18 ++++++++++++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 1d247bb..cd4165a 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -4,7 +4,6 @@
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 
 import java.io.OutputStream;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 7ab5353..a27864c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -456,7 +456,9 @@
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		parameters.put("type", "month");
 		String sensorKey = "list";
-		if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+		if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+			parameters.put("description", "description");
+		} else {
 			sensorKey = parameters.remove("sensorKey").toString();
 			List<String> sensorKeys = new ArrayList<String>();
 			sensorKeys.add(sensorKey);
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index f04bc52..3d56965 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -67,7 +67,11 @@
 					String[] split = sensor.split("-");
 					if (key.equals(split[0]) && !"0".equals(alarmData.get(key).toString())) {
 						Map<String, Object> map = new HashMap<String, Object>();
-						map.put("name", split[1]);
+						if (parameters.containsKey("description")) {
+							map.put("name", split[3]);
+						} else {
+							map.put("name", split[1]);
+						}
 						map.put("value", alarmData.get(key));
 						list.add(map);
 					}
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index d1653fc..4058715 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -223,7 +223,17 @@
 		Collections.sort(sortList,new Comparator<Map.Entry<String,Double>>(){
 			@Override
 			public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {
-				return o1.getValue().compareTo(o2.getValue());
+				if (o2.getValue().compareTo(o1.getValue()) == 0) {
+					String[] key1 = o1.getKey().split("-");
+					String[] key2 = o2.getKey().split("-");
+					String sensor1  = key1[0].replace("e", "");
+					String sensor2  = key2[0].replace("e", "");
+					if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
+						return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+					}
+					return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
+				}
+				return o2.getValue().compareTo(o1.getValue());
 			}
 			
 		});
@@ -325,7 +335,11 @@
 			List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
 			for (Sensor sensor : sensorList) {
 				sensorKeys.add(sensor.getSensorKey());
-				sensors.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());
+				String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();
+				if (parameters.containsKey("description")) {
+					string += "-" + sensor.getDescription();
+				}
+				sensors.add(string);
 			}
 		}
 		parameters.put("sensorKeys", sensorKeys);

--
Gitblit v1.8.0