From e2c5c6975f80e88d076f83ec148974f74ff64b92 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sun, 26 Mar 2023 14:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E4=B8=BA=E6=9F=A5=E8=AF=A2=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgc/neutrino/proxy/core/util/DateUtil.java | 4 ++-- neutrino-proxy-server/pom.xml | 14 +++++++------- .../proxy/server/job/FlowReportForDayJob.java | 15 ++++++++++++++- .../proxy/server/job/FlowReportForHourJob.java | 16 +++++++++++++++- .../proxy/server/job/FlowReportForMonthJob.java | 15 ++++++++++++++- 5 files changed, 52 insertions(+), 12 deletions(-) diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java index bfa4bdb1..2eaf32b2 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java +++ b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java @@ -286,7 +286,7 @@ public class DateUtil { public static Date getHourBegin(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); - setCalender(calendar, calendar.get(Calendar.HOUR), 0, 0, 0); + setCalender(calendar, calendar.get(Calendar.HOUR_OF_DAY), 0, 0, 0); return calendar.getTime(); } @@ -298,7 +298,7 @@ public class DateUtil { public static Date getHourEnd(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); - setCalender(calendar, calendar.get(Calendar.HOUR), 59, 59, 999); + setCalender(calendar, calendar.get(Calendar.HOUR_OF_DAY), 59, 59, 999); return calendar.getTime(); } diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index 13102bf3..1b7c849c 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -84,14 +84,14 @@ - - ${project.basedir}/src/main/resources - false + + + - - app-*.yml - - + + + + diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java index 9359b8e7..e68cb826 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java @@ -33,6 +33,7 @@ import fun.asgc.neutrino.proxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -60,7 +61,7 @@ public class FlowReportForDayJob implements IJobHandler { @Override public void execute(String param) throws Exception { Date now = new Date(); - String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.DATE, -1), "yyyy-MM-dd"); + String dateStr = getDateStr(now, param); // DateUtil.format(DateUtil.addDate(now, Calendar.DATE, -1), "yyyy-MM-dd"); Date date = DateUtil.parse(dateStr, "yyyy-MM-dd"); Date startHourDate = DateUtil.getDayBegin(date); Date endHourDate = DateUtil.getDayEnd(date); @@ -99,4 +100,16 @@ public class FlowReportForDayJob implements IJobHandler { } } + private String getDateStr(Date now, String params) { + if (StringUtils.isNotBlank(params)) { + try { + // 参数格式错误则取当前时间 + DateUtil.parse(params, "yyyy-MM-dd"); + return params; + } catch (Exception e) { + // ignore + } + } + return DateUtil.format(DateUtil.addDate(now, Calendar.DATE, -1), "yyyy-MM-dd"); + } } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java index e12c19e2..ede9b3da 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java @@ -11,6 +11,7 @@ import fun.asgc.neutrino.proxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -36,7 +37,7 @@ public class FlowReportForHourJob implements IJobHandler { @Override public void execute(String param) throws Exception { Date now = new Date(); - String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.HOUR, -1), "yyyy-MM-dd HH"); + String dateStr = getDateStr(now, param); // DateUtil.format(DateUtil.addDate(now, Calendar.HOUR, -1), "yyyy-MM-dd HH"); Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH"); Date startHourDate = DateUtil.getHourBegin(date); Date endHourDate = DateUtil.getHourEnd(date); @@ -75,4 +76,17 @@ public class FlowReportForHourJob implements IJobHandler { } } + private String getDateStr(Date now, String params) { + if (StringUtils.isNotBlank(params)) { + try { + // 参数格式错误则取当前时间 + DateUtil.parse(params, "yyyy-MM-dd HH"); + return params; + } catch (Exception e) { + // ignore + } + } + return DateUtil.format(DateUtil.addDate(now, Calendar.HOUR, -1), "yyyy-MM-dd HH"); + } + } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java index 262ca689..4b8f2c4c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java @@ -9,6 +9,7 @@ import fun.asgc.neutrino.proxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -38,7 +39,7 @@ public class FlowReportForMonthJob implements IJobHandler { @Override public void execute(String param) throws Exception { Date now = new Date(); - String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.MONTH, -1), "yyyy-MM"); + String dateStr = getDateStr(now, param); // DateUtil.format(DateUtil.addDate(now, Calendar.MONTH, -1), "yyyy-MM"); Date date = DateUtil.parse(dateStr, "yyyy-MM"); Date startDayDate = DateUtil.getMonthBegin(date); Date endEndDate = DateUtil.getMonthEnd(date); @@ -77,4 +78,16 @@ public class FlowReportForMonthJob implements IJobHandler { } } + private String getDateStr(Date now, String params) { + if (StringUtils.isNotBlank(params)) { + try { + // 参数格式错误则取当前时间 + DateUtil.parse(params, "yyyy-MM"); + return params; + } catch (Exception e) { + // ignore + } + } + return DateUtil.format(DateUtil.addDate(now, Calendar.MONTH, -1), "yyyy-MM"); + } }