From fbec6acd67675d6c7953d6914cb22f5774c742f0 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Nov 2018 15:16:24 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/service/impl/HistoryServiceImpl.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index c45cb88..37b4d81 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -1,10 +1,14 @@
 package com.moral.service.impl;
 
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -158,16 +162,20 @@
 		accountService.setOrgIdsByAccount(parameters);
 		
 		List<Map<String, Object>> result = historyMapper.getRegionRankingData(parameters);
-		
+		for (Map<String, Object> map : result) {
+			if (ObjectUtils.isEmpty(map.get("avg"))) {
+				map.put("avg", 0);
+			}
+		}
 		if ("profession".equals(parameters.get("dimension"))) {
 			List<Profession> professions = professionMapper.selectAll();
 			for (Map<String, Object> map : result) {
 				for (Profession profession : professions) {
 					if (map.get("name").equals(profession.getName())) {
 						professions.remove(profession);
-						if (ObjectUtils.isEmpty(map.get("avg"))) {
-							map.put("avg", 0);
-						}
+//						if (ObjectUtils.isEmpty(map.get("avg"))) {
+//							map.put("avg", 0);
+//						}
 						break;
 					}
 				}
@@ -183,9 +191,9 @@
 			for (Map<String, Object> map : result) {
 				if (regions.contains(map.get("name"))) {
 					regions.remove(map.get("name"));
-					if (ObjectUtils.isEmpty(map.get("avg"))) {
-						map.put("avg", 0);
-					}
+//					if (ObjectUtils.isEmpty(map.get("avg"))) {
+//						map.put("avg", 0);
+//					}
 				}
 				
 			}
@@ -221,20 +229,32 @@
 	
     @Override
 	public List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters) {
+		ValidateUtil.notNull(parameters.get("deviceVersionId"), "param.is.null");
+		ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+		ValidateUtil.notNull(parameters.get("deviceId"), "param.is.null");
     	List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(parameters);
     	parameters.put("size", 1);
     	List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
-    	JSONObject map = JSON.parseObject(values.get(0).get("value").toString());
+    	JSONObject map = null;
+    	if (!ObjectUtils.isEmpty(values)) {
+    		map = JSON.parseObject(values.get(0).get("value").toString());
+		}
     	Device device = deviceMapper.selectByPrimaryKey(Integer.valueOf((String) parameters.get("deviceId")));
     	for (Map<String, Object> sensor : sensors) {
-    		sensor.put("value", map.remove(sensor.get("sensor_key")));
+    		if (!ObjectUtils.isEmpty(map)) {
+    			sensor.put("value", map.remove(sensor.get("sensor_key")));
+			}
     		sensor.put("state", device.getState());
+    		sensor.put("name", sensor.get("description"));
     	}
 		return sensors;
 	}
 
 	@Override
 	public List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters) {
+		ValidateUtil.notNull(parameters.get("sensorKey"), "param.is.null");
+		ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+		ValidateUtil.notNull(parameters.get("size"), "param.is.null");
 		parameters.put("size", Integer.valueOf(parameters.remove("size").toString()));
 		List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);
 		for (Map<String, Object> value : values) {
@@ -244,4 +264,34 @@
 		return values;
 	}
 
+	@Override
+	public Map<String, Object> getActualDataByRegion(Map<String, Object> parameters) {
+		Object sensorKey = parameters.get("sensorKey");
+		ValidateUtil.notNull(sensorKey, "param.is.null");
+		ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+		ValidateUtil.notNull(parameters.get("interval"), "param.is.null");
+		Integer interval = Integer.valueOf(parameters.get("interval").toString());
+		LocalDateTime start, end;
+		if (!parameters.containsKey("time")) {
+			end = LocalDateTime.now();
+			int second = end.getSecond() / interval * interval;
+			end = end.truncatedTo(ChronoUnit.MINUTES).plusSeconds(second);
+			start = end.minusSeconds(interval);
+		} else {
+			//start = LocalDateTime.ofEpochSecond(Long.valueOf(parameters.get("time").toString()) / 1000, 0, ZoneOffset.ofHours(8));
+			start = LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.valueOf(parameters.get("time").toString())),ZoneId.of("+8"));
+			end = start.plusSeconds(interval);
+		}
+		parameters.put("start", start);
+		parameters.put("end", end);
+		parameters.put("sensorKeys", Arrays.asList(((String) sensorKey).split(",")));
+		accountService.setOrgIdsByAccount(parameters);
+		Map<String, Object> result = historyMapper.getActualDataByRegion(parameters);
+		if (ObjectUtils.isEmpty(result)) {
+			result = new HashMap<String, Object>();
+		}
+		result.put("time", end.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+		return result;
+	}
+
 }

--
Gitblit v1.8.0