From b8eddb6bca9ff9d92917132eee70dc2f6fcca73c Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 23 May 2019 10:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E5=AE=BD=E7=BB=9F=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E4=BA=94=E5=88=86=E9=92=9F=E3=80=81=E5=B0=8F=E6=97=B6=E3=80=81?= =?UTF-8?q?=E5=A4=A9=E6=8A=A5=E6=9F=A5=E5=90=84=E8=87=AA=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=EF=BC=9B=20=E6=97=A7=E7=9A=84=E5=B8=A6=E5=AE=BD=E7=BB=9F?= =?UTF-8?q?=E8=AE=A17=E5=A4=A9=E6=9F=A5=E8=AF=A25=E5=88=86=E9=92=9F?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=A4=A7=E4=BA=8E7=E5=A4=A9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B0=8F=E6=97=B6=E6=8A=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/dao/TrafficReportDao.xml | 63 +++++++++++++++++-- .../web/service/restful/DashboardService.java | 13 +++- .../service/restful/TrafficReportService.java | 8 +-- 3 files changed, 72 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/nis/web/dao/TrafficReportDao.xml b/src/main/java/com/nis/web/dao/TrafficReportDao.xml index 85bf2c3..e6e1470 100644 --- a/src/main/java/com/nis/web/dao/TrafficReportDao.xml +++ b/src/main/java/com/nis/web/dao/TrafficReportDao.xml @@ -148,12 +148,29 @@ resultMap="TrafficTransStatisticCKResultMap"> select (SUM(c2s_byte_len + s2c_byte_len)* 8)/ 300 / 1024 / 1024 / 1024 num, - toStartOfFiveMinute(stat_time) stat_time, + stat_time, addr_type, trans_type, entrance_id from - ntc_network_traffic_stat + + + + ntc_network_traffic_stat + + + + ntc_network_traffic_stat_hour + + + + ntc_network_traffic_stat_daily + + + + ntc_network_traffic_stat_daily + + where =#{beginDate} and stat_time<#{endDate} ]]> @@ -184,12 +201,29 @@ resultMap="TrafficTransStatisticCKResultMap"> select SUM(c2s_pkt_num + s2c_pkt_num)/ 300 num, - toStartOfFiveMinute(stat_time) stat_time, + stat_time stat_time, addr_type, trans_type, entrance_id from - ntc_network_traffic_stat + + + + ntc_network_traffic_stat + + + + ntc_network_traffic_stat_hour + + + + ntc_network_traffic_stat_daily + + + + ntc_network_traffic_stat_daily + + where =#{beginDate} and stat_time<#{endDate} ]]> @@ -219,12 +253,29 @@ resultMap="TrafficTransStatisticCKResultMap"> select SUM(link_num) num, - toStartOfFiveMinute(stat_time) stat_time, + stat_time, addr_type, trans_type, entrance_id from - ntc_network_traffic_stat + + + + ntc_network_traffic_stat + + + + ntc_network_traffic_stat_hour + + + + ntc_network_traffic_stat_daily + + + + ntc_network_traffic_stat_daily + + where =#{beginDate} and stat_time<#{endDate} ]]> diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java index 823c45b..e35c87c 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -1305,9 +1305,18 @@ public class DashboardService extends BaseService { } public Map getBandwidthTransByQuoTaType(String beginDate, String endDate, String searchQuotaType, - Integer searchDirection) { + Integer searchDirection) throws ParseException { TrafficTransStatisticCK trafficTransStatisticCK = new TrafficTransStatisticCK(); - trafficTransStatisticCK.setSearchBusinessType(1); + //V1的带宽统计，时间范围大于一个周，则小时粒度；时间范围小于一个周，则5分钟粒度 + double setTimeRange=7; + double timeRange=DateUtils.getDistanceOfTwoDate(DateUtils.strToDate(beginDate, "yyyy-MM-dd HH:mm:ss"), + DateUtils.strToDate(endDate, "yyyy-MM-dd HH:mm:ss")); + if(timeRange>setTimeRange){ + trafficTransStatisticCK.setSearchBusinessType(2); + }else{ + trafficTransStatisticCK.setSearchBusinessType(1); + } + trafficTransStatisticCK.setBeginDate(beginDate); trafficTransStatisticCK.setEndDate(endDate); if (searchQuotaType.toLowerCase().equals("gbps")) { diff --git a/src/main/java/com/nis/web/service/restful/TrafficReportService.java b/src/main/java/com/nis/web/service/restful/TrafficReportService.java index a917a1d..2781c33 100644 --- a/src/main/java/com/nis/web/service/restful/TrafficReportService.java +++ b/src/main/java/com/nis/web/service/restful/TrafficReportService.java @@ -166,12 +166,12 @@ public class TrafficReportService extends BaseLogService { if (list2 != null && list2.size() > 0) { for (TrafficTransStatisticCK trafficTransStatisticCK : list2) { long transTime = trafficTransStatisticCK.getStatTime().getTime(); - if (searchBusinessType == 1) {// 五分钟不需要转换了,时间已经是五分钟的格式了 -// transTime = DateUtils.getTimeByType(transTime, 0);// + if (searchBusinessType == 1) {// 带宽五分钟不需要转换了,时间已经是五分钟的格式了 +// transTime = DateUtils.getTimeByType(transTime, 0); } else if (searchBusinessType == 2) { - transTime = DateUtils.getTimeByType(transTime, 1); + //transTime = DateUtils.getTimeByType(transTime, 1); } else if (searchBusinessType == 3) { - transTime = DateUtils.getTimeByType(transTime, 2); + //transTime = DateUtils.getTimeByType(transTime, 2); } else if (searchBusinessType == 4) { transTime = DateUtils.getTimeByType(transTime, 3); } else if (searchBusinessType == 5) {