From 8125b002f0b0202c4b665f86709cb46a03170253 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Thu, 19 Jul 2018 17:32:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E9=BB=98=E8=AE=A4=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E7=9A=84=E5=89=8D=E4=BA=94?= =?UTF-8?q?=E5=88=86=E9=92=9F,=E8=80=8C=E4=B8=8D=E6=98=AF=E5=90=8E?= =?UTF-8?q?=E4=BA=94=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/DateUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nis/util/DateUtils.java b/src/main/java/com/nis/util/DateUtils.java index 701fc88..0c862e0 100644 --- a/src/main/java/com/nis/util/DateUtils.java +++ b/src/main/java/com/nis/util/DateUtils.java @@ -225,13 +225,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { //实时报表统计,默认查询最近5分钟 if("minute".equals(type) && startTime == null && endTime == null){ Calendar cal=Calendar.getInstance(); - timeMap.put("startTime", sdf.format(cal.getTime())); + timeMap.put("endTime", sdf.format(cal.getTime())); if(localLen != null){ cal.add(Calendar.MINUTE, -localLen.intValue()); }else{ cal.add(Calendar.MINUTE, -5); } - timeMap.put("endTime", sdf.format(cal.getTime())); + timeMap.put("startTime", sdf.format(cal.getTime())); logger.info("实时报表统计默认开始时间条件:"+timeMap.get("startTime")); logger.info("默认结束时间条件:"+timeMap.get("endTime")); return timeMap;