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

提交流了流量统计数据主题处理

Browse Source
This commit is contained in:
zhanghongqing
2018-12-28 17:09:59 +08:00
parent c50c97d680
commit f7b0e7a243
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

@@ -412,7 +412,8 @@ public class DashboardService extends BaseService {
}
// 存放每个时间点的总数
Map<String, List<Long>> ipCountListMap = new HashMap<String, List<Long>>();
int index = 0;
int index1 = 0;
int index2 = 0;
List sumList1 = new ArrayList();
List sumList2 = new ArrayList();
for (int i = 0; i < dateRangeList.size(); i++) {
@@ -421,27 +422,27 @@ public class DashboardService extends BaseService {
Date date = dateRangeList.get(i);
Long num1 = 0L;
Long num2 = 0L;
for (int j = index; j < entrance1.size(); j++) {
for (int j = index1; j < entrance1.size(); j++) {
NtcEntranceReport ipInfo = entrance1.get(j);
if (ipInfo.getReportTime() != null) {
if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()
&& ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) {
num1 = num1 + ipInfo.getSum();
} else {
index = j;
index1 = j;
break;
}
}
}
sumList1.add(num1);
for (int j = index; j < entrance2.size(); j++) {
for (int j = index2; j < entrance2.size(); j++) {
NtcEntranceReport ipInfo = entrance2.get(j);
if (ipInfo.getReportTime() != null) {
if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()
&& ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) {
num2 = num2 + ipInfo.getSum();
} else {
index = j;
index2 = j;
break;
}
}