From 152325bc4e51584bf68ed8b45012eb77bf226373 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 03 Apr 2018 10:47:05 +0800
Subject: [PATCH] 报表优化
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 151 +++++++-------------------------------------------
1 files changed, 21 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 8f440cd..86fd7a0 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -77,14 +77,7 @@
// ������00:00:00
parameters.put("end", localDate);
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
- String sensorKeyColumn = "";
- for (int i = 0; i < macKeys.length; i++) {
- sensorKeyColumn += "AVG(json -> '$." + macKeys[i] + "[0]') " + macKeys[i];
- if (i != macKeys.length -1) {
- sensorKeyColumn += " ,";
- }
- }
- parameters.put("sensorKeyColumn", sensorKeyColumn);
+ parameters.put("sensorKeys", Arrays.asList(macKeys));
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
return getAQIByDataMap(average);
}
@@ -259,8 +252,6 @@
@Override
public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
- List<Map<String, Object>> resultList ;
-
String type = (String) parameters.get("type");
if (!parameters.containsKey("field")) {
parameters.putAll(getElementByType(type));
@@ -280,132 +271,31 @@
parameters.put("start", start);
parameters.put("end", end);
- if (parameters.containsKey("sensorKey")) {
+ List<String> sensorKeys = new ArrayList<String>();
+ Set<String> sensorsSet = new HashSet<String>();
+ if (parameters.containsKey("sensors")) {
List<String> sensors;
try {
sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
- parameters.put("sensors", new HashSet<String>(sensors));
+ for (String sensor : sensors) {
+ sensorKeys.add(sensor.split("-")[0]);
+ }
} catch (Exception e) {
- sensors = new ArrayList<String>();
- sensors.add((String)parameters.get("sensorKey"));
+ sensors = (List<String>)parameters.remove("sensors");
+ sensorKeys.addAll(sensors);
}
- String sensorKeyColumn = "";
- for (int i = 0; i < sensors.size(); i++) {
- String sensorKey = sensors.get(i).split("-")[0];
- sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- if (i != sensors.size() - 1) {
- sensorKeyColumn += " ,";
- }
-
- }
- parameters.put("sensorKeyColumn", sensorKeyColumn);
- }
-
- //sensorKeys.clear();
- // ������������������
- if (!parameters.containsKey("mac")) {
- resultList = new ArrayList<Map<String,Object>>();
- Integer monitorPointId = Integer.valueOf(parameters.get("monitorPointId").toString());
- List<Map<String, Object>> deviceVersions = deviceMapper.getDeviceVersionIdByMonitorPoint(monitorPointId);
- ExecutorService threadPool = Executors.newCachedThreadPool();
- CompletionService<List<Map<String, Object>>> cs = new ExecutorCompletionService<List<Map<String, Object>>>(threadPool);
- List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
- for (Map<String, Object> map : deviceVersions) {
- cs.submit(new Callable<List<Map<String, Object>>>() {
- @Override
- public List<Map<String, Object>> call() throws Exception {
- Map<String, Object> parameter = new HashMap<String, Object>(parameters);
- Integer deviceVersionId = (Integer) map.get("deviceVersionId");
- if (!parameter.containsKey("sensorKeyColumn")) {
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors, parameters);
- parameter.put("sensorKeyColumn", sensorKeyColumn);
- }
- List<String> macs = deviceMapper.getDeviceMacByMonitorPointAndDeviceVersion(monitorPointId, deviceVersionId);
- if (ObjectUtils.isEmpty(macs) || macs.contains("null") ) {
- return new ArrayList<Map<String,Object>>();
- }else {
- parameter.put("macs", macs);
- return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameter);
- }
- }
- });
- }
- for (Map<String, Object> map : deviceVersions) {
- list.addAll(cs.take().get());
- }
- Map<String, Map<String, Number[]>> result = new LinkedHashMap<String, Map<String, Number[]>>();
- for (Map<String, Object> map : list) {
- time = (String) map.remove("time");
- Map<String, Number[]> times = new HashMap<String, Number[]>();
- if (result.containsKey(time)) {
- times = (Map<String, Number[]>) result.get(time);
- }
- for (Map.Entry<String,Object> entry : map.entrySet()) {
- String sensorKey = entry.getKey();
- Number[] doubles = new Number[3];
- Double sum = (Double) entry.getValue();
- Integer count = 1;
- if (times.containsKey(sensorKey)) {
- doubles = times.get(sensorKey);
- sum = (Double) doubles[0] + sum;
- count = (Integer) doubles[1] + 1;
- }
- doubles[0] = sum;
- doubles[1] = count;
- doubles[2] = new BigDecimal(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue();
- times.put(sensorKey, doubles);
- }
- result.put(time, times);
- }
- Iterator<Entry<String, Map<String, Number[]>>> iterator = result.entrySet().iterator();
- while(iterator.hasNext()){
- Entry<String, Map<String, Number[]>> entry = iterator.next();
- String resultTime = entry.getKey();
- Map<String, Number[]> value = entry.getValue();
- Map<String, Object> resultMap = new HashMap<String, Object>();
- resultMap.put("time", resultTime);
- for (String sensorKey : value.keySet()) {
- resultMap.put(sensorKey, value.get(sensorKey)[2]);
- }
- resultList.add(resultMap);
- }
- // ������ ���������
+ sensorsSet.addAll(sensors);
} else {
- // ���������������
- if (!parameters.containsKey("sensorKeyColumn")) {
- String mac = (String) parameters.get("mac");
- Device device = new Device();
- device.setMac(mac);
- device = deviceMapper.selectOne(device);
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(device.getDeviceVersionId());
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors,parameters);
- parameters.put("sensorKeyColumn", sensorKeyColumn);
-
+ List<Sensor> sensors = sensorMapper.getSensorsByCriteria(parameters);
+ for (Sensor sensor : sensors) {
+ sensorKeys.add(sensor.getSensorKey());
+ sensorsSet.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());
}
- resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
- return resultList;
- }
+ parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensors", sensorsSet);
- private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {
- String sensorKeyColumn = "";
- Set<String> sensorKeys = new HashSet<String>();
- if (parameters.containsKey("sensors")) {
- sensorKeys = (Set<String>) parameters.get("sensors");
- }
- for (int i = 0; i < sensors.size(); i++) {
- String sensorKey = (String) sensors.get(i).get("sensor_key");
- String name = (String) sensors.get(i).get("name");
- String unit = (String) sensors.get(i).get("unit");
- sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- if (i != sensors.size() - 1) {
- sensorKeyColumn += " ,";
- }
- sensorKeys.add(sensorKey + "-" + name + "-" + unit );
- parameters.put("sensors", sensorKeys);
- }
- return sensorKeyColumn;
+ return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
@Override
@@ -424,9 +314,10 @@
}
parameters.put("start", start);
parameters.put("end", end);
- String sensorKey = (String) parameters.get("macKey");
- String sensorKeyColumn = "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- parameters.put("sensorKeyColumn", sensorKeyColumn);
+ String sensorKey = (String) parameters.remove("macKey");
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensorKeys", sensorKeys);
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
if (isEmpty(average)) {
--
Gitblit v1.8.0