From f2eaa5bc6c417c9f851cb7ba2bf004c5b035c0ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 29 Aug 2018 14:40:01 +0800
Subject: [PATCH] 最近24小时aqi接口完善

---
 src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java b/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
index 1e2b781..0403039 100644
--- a/src/main/java/com/moral/service/impl/HangzhouAqiServiceImpl.java
+++ b/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) {

--
Gitblit v1.8.0