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

解决流量统计monitor二级菜单中阿拉木图数据都为0的问题

Browse Source
This commit is contained in:
renkaige
2018-12-28 11:18:55 +06:00
parent 75e414b7e6
commit c440e33f95
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,14 +405,15 @@ public class DashboardService extends BaseService {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(beginDate); calendar.setTime(beginDate);
SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
while (calendar.getTime().compareTo(endDate) < 0) { while (calendar.getTime().compareTo(endDate) <=0) {
dateRangeList.add(calendar.getTime()); dateRangeList.add(calendar.getTime());
strDateRangeList.add(sdf.format(calendar.getTime())); strDateRangeList.add(sdf.format(calendar.getTime()));
calendar.add(Calendar.MINUTE, 5); calendar.add(Calendar.MINUTE, 5);
} }
// 存放每个时间点的总数 // 存放每个时间点的总数
Map<String, List<Long>> ipCountListMap = new HashMap<String, List<Long>>(); Map<String, List<Long>> ipCountListMap = new HashMap<String, List<Long>>();
int index = 0; int index1 = 0;
int index2 = 0;
List sumList1 = new ArrayList(); List sumList1 = new ArrayList();
List sumList2 = new ArrayList(); List sumList2 = new ArrayList();
for (int i = 0; i < dateRangeList.size(); i++) { for (int i = 0; i < dateRangeList.size(); i++) {
@@ -421,27 +422,27 @@ public class DashboardService extends BaseService {
Date date = dateRangeList.get(i); Date date = dateRangeList.get(i);
Long num1 = 0L; Long num1 = 0L;
Long num2 = 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); NtcEntranceReport ipInfo = entrance1.get(j);
if (ipInfo.getReportTime() != null) { if (ipInfo.getReportTime() != null) {
if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size() if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()
&& ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) { && ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) {
num1 = num1 + ipInfo.getSum(); num1 = num1 + ipInfo.getSum();
} else { } else {
index = j; index1 = j;
break; break;
} }
} }
} }
sumList1.add(num1); sumList1.add(num1);
for (int j = index; j < entrance2.size(); j++) { for (int j = index2; j < entrance2.size(); j++) {
NtcEntranceReport ipInfo = entrance2.get(j); NtcEntranceReport ipInfo = entrance2.get(j);
if (ipInfo.getReportTime() != null) { if (ipInfo.getReportTime() != null) {
if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size() if (ipInfo.getReportTime().compareTo(date) >= 0 && (i + 1 < dateRangeList.size()
&& ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) { && ipInfo.getReportTime().compareTo(dateRangeList.get(i + 1)) < 0)) {
num2 = num2 + ipInfo.getSum(); num2 = num2 + ipInfo.getSum();
} else { } else {
index = j; index2 = j;
break; break;
} }
} }