From 5d0f7e5056781905cad2dd4c9b7803e30bd94f19 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 10 Apr 2018 09:08:19 +0800
Subject: [PATCH] 注册码管理
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 174 +++++++++++++--------------------------------------------
1 files changed, 40 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 5bb6a94..e71ff2a 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -53,7 +53,7 @@
import com.moral.service.HistoryMinutelyService;
@Service
-@SuppressWarnings({ "unchecked", "rawtypes", "unused" })
+@SuppressWarnings({ "unchecked", "unused" })
public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
@Resource
@@ -155,12 +155,12 @@
List<Object> timeList = new ArrayList<Object>();
for (int i = 0; i < timeLength; i++) {
- timeList.add(i, String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
+ timeList.add(String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
}
parameters.put("timeList", timeList);
ExecutorService threadPool = Executors.newCachedThreadPool();
- CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
+ CompletionService<Map<String, Object>> cs = new ExecutorCompletionService<Map<String, Object>>(threadPool);
for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = list.get(i);
map.put("part", i);
@@ -169,9 +169,9 @@
}
map.put("time", map.remove("formatTime"));
map.putAll(parameters);
- cs.submit(new Callable<Map<String, List<Object>>>() {
+ cs.submit(new Callable<Map<String, Object>>() {
@Override
- public Map<String, List<Object>> call() throws Exception {
+ public Map<String, Object> call() throws Exception {
return getMonitorPointOrDeviceAvgData4Compare(map);
}
});
@@ -181,7 +181,8 @@
for (Map<String, Object> map : list) {
dataList.add(cs.take().get());
}
- Map[] maps = new HashMap[list.size()];
+ Object[] datas = new Object[list.size()];
+ Object[] deviceCounts = new Object[list.size()];
Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
@@ -193,7 +194,11 @@
for (String key : map.keySet()) {
if (key.startsWith("data")) {
int index = Integer.valueOf(key.replace("data", ""));
- maps[index] = map;
+ datas[index] = map.get(key);
+ }
+ if (key.startsWith("deviceCount")) {
+ int index = Integer.valueOf(key.replace("deviceCount", ""));
+ deviceCounts[index] = map.get(key);
}
if (key.startsWith("sensors")) {
sensors.addAll((List<String>) map.get(key));
@@ -201,27 +206,19 @@
}
}
resultMap.put("times", timeList);
- resultMap.put("datas", Arrays.asList(maps));
+ resultMap.put("datas", Arrays.asList(datas));
+ resultMap.put("deviceCounts", Arrays.asList(deviceCounts));
resultMap.put("sensors", new ArrayList<Object>(sensors));
return resultMap;
}
- public Map<String, List<Object>> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
- Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
-
+ public Map<String, Object> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);
-
List<Object> timeList = (List<Object>) parameters.get("timeList");
-
- List<Object> dataList = new ArrayList<Object>();
- Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
- @Override
- public int compare(String o1, String o2) {
- return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
- }
- });
- sensors.addAll((Set<String>)parameters.get("sensors"));
+ List<String> sensors = (List<String>) parameters.get("sensors");
+ String part = parameters.get("part").toString();
Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();
for (Map<String, Object> map : resultList) {
String time = map.get("time").toString();
@@ -239,21 +236,25 @@
}
doubles[index] = (Double) map.get(sensorKey);
doubleMap.put(sensor, doubles);
-
}
}
}
- dataList.add(doubleMap);
- String part = parameters.get("part").toString();
- resultMap.put("data" + part, dataList);
- resultMap.put("sensors" + part, new ArrayList<Object>(sensors));
+
+ Object deviceCount;
+ if (parameters.containsKey("deviceCount")) {
+ deviceCount = parameters.remove("deviceCount");
+ } else {
+ deviceCount = deviceMapper.getDeviceCountByRegion(parameters);
+ }
+
+ resultMap.put("deviceCount" + part, deviceCount);
+ resultMap.put("data" + part, doubleMap);
+ resultMap.put("sensors" + part, sensors);
return resultMap;
}
@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));
@@ -273,123 +274,28 @@
parameters.put("start", start);
parameters.put("end", end);
- if (parameters.containsKey("sensorKeys")) {
- List<String> sensors;
+ List<String> sensorKeys = new ArrayList<String>();
+ List<String> sensors = new ArrayList<String>();
+ if (parameters.containsKey("sensors")) {
try {
sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
- parameters.put("sensors", new HashSet<String>(sensors));
- List<String> sensorKeys = new ArrayList<String>();
for (String sensor : sensors) {
sensorKeys.add(sensor.split("-")[0]);
}
- parameters.put("sensorKeys", sensorKeys);
} catch (Exception e) {
- sensors = (List<String>) parameters.get("sensorKeys");
+ sensorKeys = sensors = (List<String>)parameters.remove("sensors");
}
- }
-
- //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("sensorKeys")) {
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);
- List<String> sensorKeys = getSensorKeyColumnBySensors(sensors, parameters);
- parameter.put("sensorKeys", sensorKeys);
- }
- 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);
- }
- // ������ ���������
} else {
- // ���������������
- if (!parameters.containsKey("sensorKeys")) {
- 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());
- List<String> sensorKeys = getSensorKeyColumnBySensors(sensors,parameters);
- parameters.put("sensorKeys", sensorKeys);
-
+ List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
+ for (Sensor sensor : sensorList) {
+ sensorKeys.add(sensor.getSensorKey());
+ sensors.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());
}
- resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
- return resultList;
- }
+ parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensors", sensors);
- private List<String> getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {
- Set<String> sensorSet = new HashSet<String>();
- List<String> sensorKeys = new ArrayList<String>();
- if (parameters.containsKey("sensors")) {
- sensorSet = (Set<String>) parameters.get("sensors");
- }
- for (Map<String, Object> sensor : sensors) {
- String sensorKey = (String) sensor.get("sensor_key");
- String name = (String) sensor.get("name");
- String unit = (String) sensor.get("unit");
- sensorSet.add(sensorKey + "-" + name + "-" + unit );
- sensorKeys.add(sensorKey);
- }
- parameters.put("sensors", sensorSet);
- return sensorKeys;
+ return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
@Override
--
Gitblit v1.8.0