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 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 and entrance_id=#{entranceId} - group by web_id order by uniqueNum + group by web_id order by unique_num