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

NTCIPRANCE报表查询调整

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-18 06:10:15 +08:00
parent 0748992b8d
commit 6ac2cfccab
6 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/nis/domain/report/NtcIpRangeReport.java
View File

@@ -13,19 +13,56 @@ public class NtcIpRangeReport extends BaseLogEntity<NtcIpRangeReport>{
protected String ipStart;
@ExcelField(title="ip_end",sort=9)
protected String ipEnd;
@ExcelField(title="ip_start_num",sort=10)
//@ExcelField(title="ip_start_num",sort=10)
protected BigInteger ipStartNum;
@ExcelField(title="ip_end_num",sort=11)
//@ExcelField(title="ip_end_num",sort=11)
protected BigInteger ipEndNum;
@ExcelField(title="ip_sub",sort=12)
protected String ipSub;
@ExcelField(title="country",sort=13)
protected String country;
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
@ExcelField(title="desc",sort=14)
protected String desc;
protected String searchCountry;//国家
protected String searchStartIp;//开始IP
protected String searchEndIp;//结束IP
protected String searchIp;//IP
protected String searchAreaType;//area 1境内；1境外
protected String searchDesc;//
public String getSearchDesc() {
return searchDesc;
}
public void setSearchDesc(String searchDesc) {
this.searchDesc = searchDesc;
}
public String getSearchAreaType() {
return searchAreaType;
}
public void setSearchAreaType(String searchAreaType) {
this.searchAreaType = searchAreaType;
}
public String getSearchIp() {
return searchIp;
}
public void setSearchIp(String searchIp) {
this.searchIp = searchIp;
}
public String getSearchCountry() {
return searchCountry;
}

22
src/main/java/com/nis/web/controller/report/ReportController.java
View File

@@ -177,11 +177,14 @@ public class ReportController extends BaseController {
}
//查询开始IP
if (StringUtils.isNotBlank(log.getSearchStartIp())) {
params.put("searchStartIp", log.getSearchStartIp());
params.put("searchIp", log.getSearchIp());
}
//查询结束IP
if (StringUtils.isNotBlank(log.getSearchEndIp())) {
params.put("searchEndIp", log.getSearchEndIp());
//
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchType", log.getSearchAreaType());
}
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchDesc", log.getSearchDesc());
}
String url =Constants.LOG_BASE_URL + Constants.NTC_IP_RANGE_REPORT;
@@ -315,11 +318,14 @@ public class ReportController extends BaseController {
}
//查询开始IP
if (StringUtils.isNotBlank(log.getSearchStartIp())) {
params.put("searchStartIp", log.getSearchStartIp());
params.put("searchIp", log.getSearchIp());
}
//查询结束IP
if (StringUtils.isNotBlank(log.getSearchEndIp())) {
params.put("searchEndIp", log.getSearchEndIp());
//
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchType", log.getSearchAreaType());
}
if (StringUtils.isNotBlank(log.getSearchAreaType())) {
params.put("searchDesc", log.getSearchDesc());
}
String url =Constants.LOG_BASE_URL + Constants.NTC_IP_RANGE_REPORT;

5
src/main/resources/messages/message_en.properties
View File

@@ -1406,4 +1406,7 @@ APP_TCP_SESSION_BYTE=Session
ip_count=Unique IP Count
counnection_count=Connection Count
asn=asn
Unique_num=Unique
Unique_num=Unique
ip=IP
country=Country
desc=Desc

5
src/main/resources/messages/message_ru.properties
View File

@@ -1410,4 +1410,7 @@ APP_TCP_SESSION_BYTE=Session
ip_count=Unique IP Count
counnection_count=Connection Count
asn=asn
Unique_num=Unique
Unique_num=Unique
ip=IP
country=Country
desc=Desc

5
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1406,4 +1406,7 @@ APP_TCP_SESSION_BYTE=Session
ip_count=Unique IP Count
counnection_count=Connection Count
asn=asn
Unique_num=Unique
Unique_num=Unique
ip=IP
country=Country
desc=Desc

27
src/main/webapp/WEB-INF/views/report/ipRangeReportList.jsp
View File

@@ -59,28 +59,30 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="area_type"/></span>
</div>
<form:select path="searchCountry" class="selectpicker form-control input-medium">
<form:option value=""><spring:message code="select"/></form:option>
<form:select path="searchAreaType" class="selectpicker form-control input-medium">
<%-- <form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('AREA_TYPE')}" var="areaType" >
<form:option value="${areaType.itemCode}"><spring:message code="${areaType.itemValue}"></spring:message></form:option>
</c:forEach>
</c:forEach> --%>
<form:option value="1">Internal<spring:message code=""></spring:message></form:option>
<form:option value="2">External<spring:message code=""></spring:message></form:option>
</form:select>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="start_ip"/></span>
<span class="selectpicker form-control" ><spring:message code="country"/></span>
</div>
<input name="searchStartIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchStartIp }" />
<input name="searchCountry" type="text" class="form-control input-small" maxlength="20" value="${log.searchCountry}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_ip"/></span>
<span class="selectpicker form-control" ><spring:message code="ip"/></span>
</div>
<input name="searchEndIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchEndIp }" />
<input name="searchIp" type="text" class="form-control input-small" maxlength="20" value="${log.searchIp }" />
</div>
</div>
@@ -113,23 +115,24 @@
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
<th class="sort-column ip_start" columan="ip_start"><spring:message code="ip_start"/></th>
<th class="sort-column ip_end" columan="ip_end"><spring:message code="ip_end"/></th>
<th class="sort-column ip_start_num" columan="ip_start_num"><spring:message code="ip_start_num"/></th>
<th class="sort-column ip_end_num" columan="ip_end_num"><spring:message code="ip_end_num"/></th>
<th class="sort-column ip_sub" columan="ip_sub"><spring:message code="ip_sub"/></th>
<th class="sort-column ip_start_num" columan="ip_start_num"><spring:message code="country"/></th>
<th class="sort-column ip_end_num" columan="ip_end_num"><spring:message code="desc"/></th>
</tr>
</thead>
<tbody>
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<%-- <td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ? </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo" ><i class="icon-book-open"></i></a>
</td> --%>
<td>${log.ipStart }</td>
<td>${log.ipEnd }</td>
<td>${log.ipStartNum}</td>
<td>${log.ipEndNum}</td>
<td>${log.ipSub}</td>
<td>${log.country}</td>
<td>${log.desc}</td>
</tr>
</c:forEach>
</tbody>