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

1.统计报表模块打印添加标题和合计行 2.Website Statistics页面unique改为client IP

Browse Source 
3.Logs-HTTP-KeywordLogToURL和实时统计-Statistics-Packet，Stream，Protocol,multimedia,Anti
DDos,Proxy页面自定义列全部隐藏时，不允许导出，提示用户
This commit is contained in:
shangguanyanfei
2019-01-14 17:34:20 +08:00
parent e94c448fb1
commit d4270894b5
20 changed files with 699 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/web/controller/report/NtcEventBlockController.java
View File

@@ -395,7 +395,32 @@ public class NtcEventBlockController extends BaseController {
list = data.getList();
}
}
//计算合计，并添加在集合的最后位置
Properties msgProp = getMsgProp();
NtcEventMonitorOrBlockReport ntcEventMonitorOrBlockReport = new NtcEventMonitorOrBlockReport();
long ipNum = 0;
long httpNum = 0;
long mailNum = 0;
long vedioNum = 0;
long agentNum = 0;
for (NtcEventMonitorOrBlockReport entity : list) {
ipNum += entity.getIpNum();
httpNum += entity.getHttpNum();
mailNum += entity.getMailNum();
vedioNum += entity.getVedioNum();
agentNum += entity.getAgentNum();
}
String report_total = msgProp.getProperty("report_total");
ntcEventMonitorOrBlockReport.setIpNum(ipNum);
ntcEventMonitorOrBlockReport.setHttpNum(httpNum);
ntcEventMonitorOrBlockReport.setMailNum(mailNum);
ntcEventMonitorOrBlockReport.setVedioNum(vedioNum);
ntcEventMonitorOrBlockReport.setAgentNum(agentNum);
ntcEventMonitorOrBlockReport.setTaskIds(report_total);
ntcEventMonitorOrBlockReport.setTaskName("　　　　一　　　");
ntcEventMonitorOrBlockReport.setTaskTime("　　　　一　　　");
ntcEventMonitorOrBlockReport.setReportTime("　　　　一　　　");
list.add(ntcEventMonitorOrBlockReport);
return list;
} catch (Exception e) {
logger.error("ntc_event_block_report print failed", e);

24
src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java
View File

@@ -386,6 +386,30 @@ public class NtcEventKeyProtectionController extends BaseController {
list = data.getList();
}
}
//计算合计，并填加到集合最后
Properties msgProp = getMsgProp();
NtcEventKeyProtectionReport ntcEventKey=new NtcEventKeyProtectionReport();
long letterNum=0;
long configNum=0;
long monitorNum=0;
long controlNum=0;
for (NtcEventKeyProtectionReport entity : list) {
letterNum += entity.getLetterNum();
configNum += entity.getConfigNum();
monitorNum += entity.getMonitorNum();
controlNum += entity.getControlNum();
}
String report_total=msgProp.getProperty("report_total");
ntcEventKey.setLetterNum(letterNum);
ntcEventKey.setConfigNum(configNum);
ntcEventKey.setMonitorNum(monitorNum);
ntcEventKey.setControlNum(controlNum);
ntcEventKey.setTaskIds(report_total);
ntcEventKey.setTaskName("　　　　一　　　");
ntcEventKey.setTaskTime("　　　　一　　　");
ntcEventKey.setReportTime("　　　　一　　　");
list.add(ntcEventKey);
return list;
} catch (Exception e) {
logger.error("ntc_event_key_protection_report print failed", e);

26
src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java
View File

@@ -393,6 +393,32 @@ public class NtcEventMonitorController extends BaseController {
list = data.getList();
}
}
//计算合计，并添加到集合的最后
Properties msgProp = getMsgProp();
NtcEventMonitorOrBlockReport ntcEventMonitorOrBlockReport = new NtcEventMonitorOrBlockReport();
long ipNum = 0;
long httpNum = 0;
long mailNum = 0;
long vedioNum = 0;
long agentNum = 0;
for (NtcEventMonitorOrBlockReport entity : list) {
ipNum += entity.getIpNum();
httpNum += entity.getHttpNum();
mailNum += entity.getMailNum();
vedioNum += entity.getVedioNum();
agentNum += entity.getAgentNum();
}
String report_total = msgProp.getProperty("report_total");
ntcEventMonitorOrBlockReport.setIpNum(ipNum);
ntcEventMonitorOrBlockReport.setHttpNum(httpNum);
ntcEventMonitorOrBlockReport.setMailNum(mailNum);
ntcEventMonitorOrBlockReport.setVedioNum(vedioNum);
ntcEventMonitorOrBlockReport.setAgentNum(agentNum);
ntcEventMonitorOrBlockReport.setTaskIds(report_total);
ntcEventMonitorOrBlockReport.setTaskName("　　　　一　　　");
ntcEventMonitorOrBlockReport.setTaskTime("　　　　一　　　");
ntcEventMonitorOrBlockReport.setReportTime("　　　　一　　　");
list.add(ntcEventMonitorOrBlockReport);
return list;
} catch (Exception e) {
logger.error("ntc_event_monitor_report print failed", e);

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

@@ -613,6 +613,23 @@ public class ReportController extends BaseController {
list = data.getList();
}
}
Properties msgProp = getMsgProp();
NtcAsnRecord ntcAsnRecord = new NtcAsnRecord();
double pps = 0;
double bps = 0;
for (NtcAsnRecord entity : list) {
if (null != entity.getBps() && !"".equals(entity.getBps())) {
bps += Double.valueOf(entity.getBps());
}
if (null != entity.getPps() && !"".equals(entity.getPps())) {
pps += Double.valueOf(entity.getPps());
}
}
String report_total = msgProp.getProperty("report_total");
ntcAsnRecord.setAsn(report_total);
ntcAsnRecord.setBps(String.format("%.2f", bps));
ntcAsnRecord.setPps(String.format("%.2f", pps));
list.add(ntcAsnRecord);
return list;
} catch (Exception e) {
logger.error("Ntc_Asn_Record print failed", e);
@@ -664,6 +681,19 @@ public class ReportController extends BaseController {
list = data.getList();
}
}
Properties msgProp = getMsgProp();
NtcURLReport ntcURLReport = new NtcURLReport();
long ipCount=0;
long connCount=0;
for (NtcURLReport entity : list) {
ipCount += entity.getIpCount();
connCount += entity.getConnCount();
}
String report_total = msgProp.getProperty("report_total");
ntcURLReport.setIpCount(ipCount);
ntcURLReport.setConnCount(connCount);
ntcURLReport.setUrl(report_total);
list.add(ntcURLReport);
return list;
} catch (Exception e) {
logger.error("Ntc_HTTPS_Report print failed", e);