gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉通联关系日志界面运营商展示，去掉流量统计app详情趋势运营商展示，同时修改导出去掉运营商列，app跳转到app详情界面时携带地域条件

Browse Source 
(cherry picked from commit d0b4907271)
This commit is contained in:
zhanghongqing
2019-01-21 08:54:09 +00:00
committed by 王鑫
parent f8a90c0c8f
commit cca47e3823
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/log/NtcConnRecordLog.java
View File

@@ -31,8 +31,6 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
protected String ispCode;//运营商 protected String ispCode;//运营商
protected String ispNum;//运营商 （entrance_id+device_id） protected String ispNum;//运营商 （entrance_id+device_id）
@Expose
@ExcelField(title="client_port",sort=43)
protected String ispName;//运营商 protected String ispName;//运营商

3
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -457,7 +457,7 @@ public class TrafficStatisticsInfoController extends BaseController {
* App趋势界面 独立IP访问数量趋势图 * App趋势界面 独立IP访问数量趋势图
*/ */
@RequestMapping(value="appTrendList") @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)){ if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
Calendar cal = Calendar. getInstance (); Calendar cal = Calendar. getInstance ();
cal.setTime(new Date()); cal.setTime(new Date());
@@ -467,6 +467,7 @@ public class TrafficStatisticsInfoController extends BaseController {
} }
model.addAttribute("appName", appName); model.addAttribute("appName", appName);
model.addAttribute("appType", appType); model.addAttribute("appType", appType);
model.addAttribute("entranceId", entranceId);
model.addAttribute("beginDate", beginDate); model.addAttribute("beginDate", beginDate);
model.addAttribute("endDate", endDate); model.addAttribute("endDate", endDate);
return "/dashboard/trafficAppTrendList"; return "/dashboard/trafficAppTrendList";

4
src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
View File

@@ -121,7 +121,7 @@ public class NtcConnRecordLogController extends BaseController {
if (fromJson.getStatus().intValue() == 200) { if (fromJson.getStatus().intValue() == 200) {
Page<NtcConnRecordLog> data = fromJson.getData(); Page<NtcConnRecordLog> data = fromJson.getData();
List<SysIspInfo> ispList = CodeDicUtils.getIspListByIspNum(); List<SysIspInfo> ispList = CodeDicUtils.getIspListByIspNum();
if(data.getList()!=null&&data.getList().size()>0){ /*if(data.getList()!=null&&data.getList().size()>0){
for (NtcConnRecordLog cnn : data.getList()) { for (NtcConnRecordLog cnn : data.getList()) {
String isNum=cnn.getEntranceId()+""+cnn.getDeviceId(); String isNum=cnn.getEntranceId()+""+cnn.getDeviceId();
for (SysIspInfo sysIspInfo : ispList) { for (SysIspInfo sysIspInfo : ispList) {
@@ -132,7 +132,7 @@ public class NtcConnRecordLogController extends BaseController {
} }
} }
} }*/
page.setCount(data.getCount()); page.setCount(data.getCount());
page.setLast(data.getLast()); page.setLast(data.getLast());
page.setList(data.getList()); page.setList(data.getList());

16
src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
View File

@@ -46,7 +46,12 @@
<select id="entranceId1" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search"> <select id="entranceId1" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" > <c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" >
<c:if test="${!empty entranceId }">
<option value="${dict.itemCode}" <c:if test="${entranceId==dict.itemCode }">selected</c:if>><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
<c:if test="${empty entranceId }">
<option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option> <option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -111,7 +116,12 @@
<select id="entranceId2" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search"> <select id="entranceId2" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" > <c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict" >
<c:if test="${!empty entranceId }">
<option value="${dict.itemCode}" <c:if test="${entranceId==dict.itemCode }">selected</c:if>><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
<c:if test="${empty entranceId }">
<option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option> <option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"></spring:message></option>
</c:if>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -182,7 +192,7 @@
<thead> <thead>
<tr> <tr>
<th><spring:message code="client_ip"/></th> <th><spring:message code="client_ip"/></th>
<th><spring:message code="isp"/></th> <%-- <th><spring:message code="isp"/></th> --%>
<th><spring:message code="link_num"/></th> <th><spring:message code="link_num"/></th>
<th><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th> <th><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th>
<th><spring:message code="packets"/></th> <th><spring:message code="packets"/></th>
@@ -361,7 +371,7 @@
if (data != null) { if (data != null) {
var html ="<tr>"; var html ="<tr>";
html += "<td class='tc'>" + data.ipAddr + "</td>"; html += "<td class='tc'>" + data.ipAddr + "</td>";
html += "<td class='tc'>" + data.ispName + "</td>"; // html += "<td class='tc'>" + data.ispName + "</td>";
html += "<td class='tc'>" + data.logNum + "</td>"; html += "<td class='tc'>" + data.logNum + "</td>";
html += "<td class='tc'>" + data.logPercent + " %</td>"; html += "<td class='tc'>" + data.logPercent + " %</td>";
// html += "<td class='tc'>" + (((data.entranceId)==1) ? "Astana":"Almaty") + "</td>"; // html += "<td class='tc'>" + (((data.entranceId)==1) ? "Astana":"Almaty") + "</td>";
@@ -375,7 +385,7 @@
if(index==fileDataS.length-1){ if(index==fileDataS.length-1){
html+="<tr class='tr-total hidden'>" html+="<tr class='tr-total hidden'>"
html+= "<td class='tc'>"+"<spring:message code='report_total'/>"+"</td>"; html+= "<td class='tc'>"+"<spring:message code='report_total'/>"+"</td>";
html+= "<td class='tc'>" +"--"+"</td>"; // html+= "<td class='tc'>" +"--"+"</td>";
html+= "<td class='tc'>"+totalunique+"</td>"; html+= "<td class='tc'>"+totalunique+"</td>";
html+= "<td class='tc'>" +"--"+"</td>"; html+= "<td class='tc'>" +"--"+"</td>";
html+= "<td class='tc'>"+totalpkt+"</td>"; html+= "<td class='tc'>"+totalpkt+"</td>";

3
src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
View File

@@ -381,7 +381,8 @@ function htmlData(fileDataS){
function openAppTrend(appType,appName){ function openAppTrend(appType,appName){
var beginDate=$("#beginDateh").val(); var beginDate=$("#beginDateh").val();
var endDate=$("#endDateh").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) window.location.href=(url)
} }
/** /**

4
src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
View File

@@ -390,7 +390,7 @@
<th class="sort-column s_ip" column="client_ip"><spring:message code="client_ip"/></th> <th class="sort-column s_ip" column="client_ip"><spring:message code="client_ip"/></th>
<th class="sort-column d_port" column="server_port"><spring:message code="server_port"/></th> <th class="sort-column d_port" column="server_port"><spring:message code="server_port"/></th>
<th class="sort-column s_port" column="client_port"><spring:message code="client_port"/></th> <th class="sort-column s_port" column="client_port"><spring:message code="client_port"/></th>
<th class="sort-column device_id" column="isp"><spring:message code="isp"/></th> <%-- <th class="sort-column device_id" column="isp"><spring:message code="isp"/></th> --%>
<th class="sort-column s2c_pkt_num" column="s2c_pkt_num"><spring:message code='s2c_pkt_num'/></th> <th class="sort-column s2c_pkt_num" column="s2c_pkt_num"><spring:message code='s2c_pkt_num'/></th>
<th class="sort-column c2s_pkt_num" column="c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th> <th class="sort-column c2s_pkt_num" column="c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
@@ -505,7 +505,7 @@
<td >${log.sIp}</td> <td >${log.sIp}</td>
<td>${log.dPort }</td> <td>${log.dPort }</td>
<td>${log.sPort }</td> <td>${log.sPort }</td>
<td>${log.ispName }</td> <%-- <td>${log.ispName }</td> --%>
<td>${log.s2cPktNum }</td> <td>${log.s2cPktNum }</td>
<td>${log.c2sPktNum }</td> <td>${log.c2sPktNum }</td>