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;