更新 时间api用法

xufenglei

2018-02-10 f2857dd60023bb0ddb87f7f06993987f97a4b2be

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

@@ -1,15 +1,13 @@
package com.moral.service.impl;



import static com.moral.common.bean.Constants.NULL_VALUE;

import static org.apache.commons.lang3.time.DateUtils.addDays;

import static org.apache.commons.lang3.time.DateUtils.addMonths;

import static org.apache.commons.lang3.time.DateUtils.truncate;

import static org.springframework.util.ObjectUtils.isEmpty;



import java.math.BigDecimal;

import java.math.RoundingMode;

import java.time.LocalDate;

import java.time.temporal.TemporalAdjusters;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.Date;

@@ -30,19 +28,15 @@
import javax.annotation.Resource;



import org.apache.commons.lang3.time.DateUtils;

import org.springframework.data.mongodb.core.aggregation.Aggregation;

import org.springframework.data.mongodb.core.aggregation.AggregationResults;

import org.springframework.data.mongodb.core.query.Criteria;

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;



import com.mongodb.BasicDBObject;

import com.moral.common.util.CalculateUtils;

import com.moral.common.util.ResourceUtil;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Device;

import com.moral.mapper.HistoryMinutelyMapper;

import com.moral.mapper.DeviceMapper;

import com.moral.mapper.HistoryMinutelyMapper;

import com.moral.mapper.SensorMapper;

import com.moral.service.HistoryMinutelyService;



@@ -63,11 +57,12 @@
   @Override

   public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {

      ValidateUtil.notNull(parameters.get("mac"), "param.is.null");

      Date date = new Date();

      LocalDate localDate = LocalDate.now();

      // 昨日00:00:00

      parameters.put("start", truncate(addDays(date, -1), Calendar.DATE));

      parameters.put("start", localDate.minusDays(1));

		
      // 今日00:00:00

      parameters.put("end", truncate(date, Calendar.DATE));

      parameters.put("end", localDate);

      String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };

      String sensorKeyColumn = "";

      for (int i = 0; i < macKeys.length; i++) {

@@ -383,19 +378,17 @@
      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();

      Date end = truncate(date, Calendar.DATE), start;

      LocalDate end = LocalDate.now(),start;

      // 每月一日的数据取上月的数据

      if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {

      if (1 == end.getDayOfMonth()) {

         // 上个月1日00:00:00

         start = truncate(addMonths(date, -1), Calendar.MONTH);

         start = end.plusDays(-1).with(TemporalAdjusters.firstDayOfMonth());

      } else {

         // 这个月1日00:00:00

         start = truncate(date, Calendar.MONTH);

         start = end.with(TemporalAdjusters.firstDayOfMonth());

      }

      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);