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

1:为通联关系查询添加asn的条件

Browse Source 
2:修改traffic的查询bug
This commit is contained in:
renkaige
2018-12-18 06:46:27 +06:00
parent bfefa4af32
commit baf0a08058
4 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/nis/web/service/LogDataService.java
View File

@@ -89,9 +89,8 @@ public class LogDataService {
throw new RestServiceException("searchFoundStartTime() can not exceed searchFoundEndTime",
RestBusinessCode.param_formate_error.getValue());
}
String searchAsn = ntcAsnRecord.getSearchAsn();
String asn = "s_asn ";
if (ntcAsnRecord.getSearchAsnType().trim().equals("1")) {
asn = "d_asn ";
@@ -110,16 +109,27 @@ public class LogDataService {
sql.append(startTime);
sql.append(" and found_time< ");
sql.append(endTime);
if (searchAsn != null && !searchAsn.equals("")) {
sql.append(" and " + asn + "='" + searchAsn + "'");
}
StringBuffer countSql = new StringBuffer();
countSql.append("select count(1) from (");
countSql.append(sql);
countSql.append(" ) group by ");
countSql.append(asn+")");
Integer startNum = (page.getPageNo() - 1) * page.getPageSize();
Integer limitCount = startNum + page.getPageSize();
sql.append(" limit " + limitCount + " ) group by "+asn+" order by bps desc,pps desc limit " + startNum + "," + page.getPageSize());
countSql.append(" ) ");
if (searchAsn != null && !searchAsn.equals("")) {
countSql.append(" and " + asn + "='" + searchAsn + "'");
}
countSql.append("group by ");
countSql.append(asn + ")");
Integer startNum = 0;
Integer limitCount = startNum + 20;
sql.append(" limit " + limitCount + " ) ");
if (searchAsn != null && !searchAsn.equals("")) {
sql.append(" and " + asn + "='" + searchAsn + "'");
}
sql.append("group by " + asn + " order by bps desc,pps desc limit " + startNum + "," + 20);
localLogJDBCByDruid.getCount(page, countSql.toString());
page.setList(localLogJDBCByDruid.getNtcAsnRecordData(sql.toString()));