Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -9,6 +9,7 @@
import java.time.temporal.TemporalAdjusters;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.Date;

@@ -339,4 +340,25 @@
      return resultMap;

      

   }



   @Override

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

      String mac = parameters.get("mac").toString();

      //获取日期

      LocalDate localDate = LocalDate.now();

       Calendar c = Calendar.getInstance();//可以对每个时间域单独修改

       int endHour = c.get(Calendar.HOUR_OF_DAY);

       String endTime = localDate+" "+endHour+":00:00";

    	
       String startTime;

       if(endHour == 0) {

          LocalDate startDate = localDate.minusDays(1);

          startTime = startDate+" "+"23:00:00";

       }else {

         int startHour = endHour-1;

         startTime = localDate+" "+startHour+":00:00";

      }

      Map<String, Object> map = historyMapper.getAVGValueByMacAndTimeslot(mac, startTime, endTime);

      return map;

   }

}