From c440e33f95244634efdfaebf554fdeeb4987cbcc Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@iie.ac.cn>
Date: Fri, 28 Dec 2018 11:18:55 +0600
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1monitor=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E9=98=BF=E6=8B=89=E6=9C=A8=E5=9B=BE=E6=95=B0=E6=8D=AE=E9=83=BD?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/service/restful/DashboardService.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java
index 814be38..20e4691 100644
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -405,14 +405,15 @@ public class DashboardService extends BaseService {
 			Calendar calendar = Calendar.getInstance();
 			calendar.setTime(beginDate);
 			SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
-			while (calendar.getTime().compareTo(endDate) < 0) {
+			while (calendar.getTime().compareTo(endDate) <=0) {
 				dateRangeList.add(calendar.getTime());
 				strDateRangeList.add(sdf.format(calendar.getTime()));
 				calendar.add(Calendar.MINUTE, 5);
 			}
 			// 存放每个时间点的总数
 			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;
 						}
 					}