From 77b6873bd326452ba708d4d6c95526abe6480376 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Tue, 18 Dec 2018 06:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=99=82=E9=96=93?=
 =?UTF-8?q?=E5=8F=83=E6=95=B8=E5=8F=8A=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/restful/DashboardServiceController.java    | 4 ++--
 .../com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
index 796914d..6f7d89e 100644
--- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
+++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java
@@ -903,9 +903,9 @@ public class DashboardServiceController extends BaseRestController {
 			} else {
 				Calendar cal = Calendar.getInstance();
 				cal.setTime(new Date());
-				Date begin1 = cal.getTime();// 获取到完整的时间
+				Date end1 = cal.getTime();// 获取到完整的时间
 				cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
-				Date end1 = cal.getTime();
+				Date begin1 = cal.getTime();
 				// 带查询时间查询所有
 				List<Map> websiteChart = dashboardService.getTopicDetails(begin1, end1);
 				if (websiteChart != null && websiteChart.size() > 0) {
diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
index 36f17c5..678fede 100644
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -132,7 +132,7 @@ FROM
 		<if test="entranceId!=null">
 			and entrance_id=#{entranceId}
 		</if>
-		group by web_id order by uniqueNum
+		group by web_id order by unique_num
 	</select>
 	<select id="getDomainTrans" resultType="com.nis.domain.restful.dashboard.TrafficHttpFocusStatistic">
 		select 	stat_time time, unique_num count from traffic_http_focus_statistic t where