From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 394a69c..82e5fc6 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -22,7 +22,6 @@
import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
@@ -33,6 +32,7 @@
import com.moral.common.exception.BusinessException;
import com.moral.common.util.CalculateUtils;
import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.ValidateUtil;
import com.moral.mapper.HistoryMapper;
import com.moral.service.AccountService;
import com.moral.service.HistoryService;
@@ -51,6 +51,8 @@
@Override
public Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
accountService.setOrgIdsByAccount(parameters);
Date date = new Date();
// ������������ -10������
@@ -74,8 +76,11 @@
@Override
public Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters) {
- Map<String, Object> result = new LinkedHashMap<String, Object>();
+ ValidateUtil.notNull(parameters.get("areaCode"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
accountService.setOrgIdsByAccount(parameters);
Date date = new Date();
// ������������ -1������
@@ -92,6 +97,7 @@
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
Map<String, Object> resultMap = new HashMap<String, Object>();
Date date = new Date();
// ������00:00:00
@@ -151,6 +157,8 @@
@Override
public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");
Map<String, Object> result = new HashMap<String, Object>();
Date date = new Date();
Long end = truncate(date, Calendar.DATE).getTime(), start;
--
Gitblit v1.8.0