From cca47e38237f0b23b85aeca03afc8791c50f008a Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 21 Jan 2019 08:54:09 +0000 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=9A=E8=81=94=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1app=E8=AF=A6=E6=83=85=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E8=BF=90=E8=90=A5=E5=95=86=E5=B1=95=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=BF=90=E8=90=A5=E5=95=86=E5=88=97=EF=BC=8Capp?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0app=E8=AF=A6=E6=83=85=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=97=B6=E6=90=BA=E5=B8=A6=E5=9C=B0=E5=9F=9F=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d0b49072714de821dd41afc4a0890a8156db10d0) --- .../com/nis/domain/log/NtcConnRecordLog.java | 2 -- .../TrafficStatisticsInfoController.java | 3 ++- .../log/ntc/NtcConnRecordLogController.java | 4 ++-- .../views/dashboard/trafficAppTrendList.jsp | 16 +++++++++++++--- .../views/dashboard/trafficAppTypeList.jsp | 3 ++- .../WEB-INF/views/log/ntc/connRecordLogList.jsp | 4 ++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java index 9483d9ac6..37d9ef39a 100644 --- a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java +++ b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java @@ -31,8 +31,6 @@ public class NtcConnRecordLog extends BaseLogEntity { protected String ispCode;//运营商 protected String ispNum;//运营商 （entrance_id+device_id） - @Expose - @ExcelField(title="client_port",sort=43) protected String ispName;//运营商 diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 7efbbc582..a5066ad63 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -457,7 +457,7 @@ public class TrafficStatisticsInfoController extends BaseController { * App趋势界面 独立IP访问数量趋势图 */ @RequestMapping(value="appTrendList") - public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType){ + public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType,Integer entranceId){ if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){ Calendar cal = Calendar. getInstance (); cal.setTime(new Date()); @@ -467,6 +467,7 @@ public class TrafficStatisticsInfoController extends BaseController { } model.addAttribute("appName", appName); model.addAttribute("appType", appType); + model.addAttribute("entranceId", entranceId); model.addAttribute("beginDate", beginDate); model.addAttribute("endDate", endDate); return "/dashboard/trafficAppTrendList"; diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index 335db9682..3be4e366b 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java @@ -121,7 +121,7 @@ public class NtcConnRecordLogController extends BaseController { if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); List ispList = CodeDicUtils.getIspListByIspNum(); - if(data.getList()!=null&&data.getList().size()>0){ + /*if(data.getList()!=null&&data.getList().size()>0){ for (NtcConnRecordLog cnn : data.getList()) { String isNum=cnn.getEntranceId()+""+cnn.getDeviceId(); for (SysIspInfo sysIspInfo : ispList) { @@ -132,7 +132,7 @@ public class NtcConnRecordLogController extends BaseController { } } - } + }*/ page.setCount(data.getCount()); page.setLast(data.getLast()); page.setList(data.getList()); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp index c05a490ba..d287d16a5 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp @@ -46,7 +46,12 @@ @@ -111,7 +116,12 @@ @@ -182,7 +192,7 @@ - +<%-- --%> () @@ -361,7 +371,7 @@ if (data != null) { var html =""; html += "" + data.ipAddr + ""; - html += "" + data.ispName + ""; +// html += "" + data.ispName + ""; html += "" + data.logNum + ""; html += "" + data.logPercent + " %"; // html += "" + (((data.entranceId)==1) ? "Astana":"Almaty") + ""; @@ -375,7 +385,7 @@ if(index==fileDataS.length-1){ html+="" html+= ""+""+""; - html+= "" +"--"+""; +// html+= "" +"--"+""; html+= ""+totalunique+""; html+= "" +"--"+""; html+= ""+totalpkt+""; diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp index c1e0520cc..9cdedb02e 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp @@ -381,7 +381,8 @@ function htmlData(fileDataS){ function openAppTrend(appType,appName){ var beginDate=$("#beginDateh").val(); var endDate=$("#endDateh").val(); - var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appName="+appName+"&appType="+appType; + var entranceId = $("#entranceId").val(); + var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appName="+appName+"&appType="+appType+"&entranceId="+entranceId; window.location.href=(url) } /** diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp index bf1b86247..48be57507 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp @@ -390,7 +390,7 @@ - +<%-- --%> @@ -505,7 +505,7 @@ ${log.sIp} ${log.dPort } ${log.sPort } - ${log.ispName } +<%-- ${log.ispName } --%> ${log.s2cPktNum } ${log.c2sPktNum }