最近24小时aqi接口完善

fengxiang

2018-08-29 f2eaa5bc6c417c9f851cb7ba2bf004c5b035c0ef

最近24小时aqi接口完善

 src/main/java/com/moral/common/util/ReportTimeFormat.java

@@ -3,6 +3,7 @@
import com.moral.entity.charts.TimePeriod;
import com.moral.entity.charts.TimeUnits;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -72,7 +73,7 @@
               timeList.add(time);
               start.add(timeUnit,1);
           }
           while (start.getTimeInMillis()<end.getTimeInMillis());
           while (start.getTimeInMillis()<=end.getTimeInMillis());
           return timeList;
       }

@@ -88,14 +89,48 @@
         rightNow.setTime(date);
         rightNow.add(toCalendarTimeUnit(timeUnits), amount);
         return rightNow.getTime();
       }
     }

    /**
     * 获取格式化后的时间
     * @param format
     * @return
     * @throws ParseException
     */
     public  static  Date getFormatDate(String format){
         Date date = null;
         try {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
             String dateString = simpleDateFormat.format(new Date());
             date = simpleDateFormat.parse(dateString);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
         return date;
     }
    /**
     * 设置时间
     * @param date
     * @param timeUnits
     * @param value
     * @return
     */
     public static Date dateSetValue(Date date,TimeUnits timeUnits,Integer value) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         cal.set(toCalendarTimeUnit(timeUnits), value);
         return cal.getTime();
     }

     private static int toCalendarTimeUnit(TimeUnits timeUnits) {
           switch (timeUnits) {
               case YEAR: return  Calendar.YEAR;
               case MONTH: return  Calendar.MONTH;
               case DAY: return  Calendar.DAY_OF_YEAR;
               case HOUR: return  Calendar.HOUR;
               default: return  Calendar.MINUTE;
               case MINUTE: return  Calendar.MINUTE;
               case SECOND: return  Calendar.SECOND;
               default: return  Calendar.MILLISECOND;
           }
     }
     /**"yyyy-MM-dd hh:mm:ss"

 src/main/java/com/moral/entity/charts/TimeUnits.java

@@ -1,5 +1,5 @@
package com.moral.entity.charts;

public enum  TimeUnits {
    YEAR,MONTH,DAY,HOUR,MINUTE
    YEAR,MONTH,DAY,HOUR,MINUTE,SECOND,MILLISECOND
}

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

@@ -35,8 +35,9 @@
    }
    private List<Map> queryAqi24Hours(Integer orgId,boolean isGetCity) {
        List<Map> aqi24HoursValues = new ArrayList<>(24);
        Date start = ReportTimeFormat.dateCalc(new Date(), TimeUnits.HOUR,-24);
        Date end = new Date();
        Date now = ReportTimeFormat.getFormatDate(ReportTimeFormat.HOUR_FORMAT);
        Date start = ReportTimeFormat.dateCalc(now, TimeUnits.HOUR,-24);
        Date end = ReportTimeFormat.dateCalc(now, TimeUnits.MILLISECOND,-1);;
        TimePeriod timePeriod = new TimePeriod(start,end,TimeUnits.HOUR);
        Integer code = getCode(orgId,isGetCity);
        if(code == null) {