From b38a3652dd0a18ec976adc13b989df232c3849db Mon Sep 17 00:00:00 2001 From: renkaige Date: Tue, 8 Jan 2019 20:44:44 +0600 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E4=B8=ADaddrTypes,transTypes,entran?= =?UTF-8?q?ceIds=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=80=BC,=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87=E4=BD=8E=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/DashboardServiceController.java | 2 -- .../nis/web/service/restful/DashboardService.java | 12 ++++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java index 7b488d8..59a9432 100644 --- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java +++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java @@ -216,8 +216,6 @@ public class DashboardServiceController extends BaseRestController { @RequestMapping(value = "trafficBandwidthTransThree", method = RequestMethod.GET) @ApiOperation(value = "带宽根据ip46,协议tcp,udp查询详情", httpMethod = "GET", notes = "对应带宽根据IPv4,6,协议tcp,udp统计数据显示") public Map trafficBandwidthTransThree(String beginDate,String endDate,String searchQuotaType,Model model, HttpServletRequest request, HttpServletResponse response) { - String[] addrTypes=dashboardService.getFiledTypeByName("addr_type"); - String[] transTypes=dashboardService.getFiledTypeByName("trans_type"); long start = System.currentTimeMillis(); AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); Map resultMap=new HashMap(); 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 b50ce34..59a9776 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -66,7 +66,14 @@ public class DashboardService extends BaseService { public NtcTotalReportDao ntcTotalReportDao; @Autowired public TrafficPortActiveStatisticDao trafficPortActiveStatisticDao; - + //ip地址类型 + private final String[] addrTypes = {"4","6"} ; + //tcp udp + private final String[] transTypes ={"17","6"} ; + //区域 + private final String[] entranceIds ={"1","2"} ; + + /** * 流量统计 数据显示 info：先查询最近时间，根据时间条件查询数据 效率提高 */ @@ -1285,9 +1292,6 @@ public class DashboardService extends BaseService { dateRangeList.add(calendar.getTime()); calendar.add(Calendar.MINUTE, Constants.TREND_TIME_INTERVAL); } - String[] addrTypes = getFiledTypeByName("addr_type"); - String[] transTypes = getFiledTypeByName("trans_type"); - String[] entranceIds = getFiledTypeByName("entrance_id"); if (bandwidthListIPvx != null && bandwidthListIPvx.size() > 0 && bandwidthListProtocol != null && bandwidthListProtocol.size() > 0 && addrTypes != null && addrTypes.length > 0 && transTypes != null && transTypes.length > 0 && entranceIds != null && entranceIds.length > 0) {