接口 增加校验

xufenglei

2017-12-11 59d80f82ef195f03b714fa0e9aec5d21d119c335

 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -32,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;

@@ -50,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分钟

@@ -73,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小时

@@ -91,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

@@ -150,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;