From 78da4c26d72d0f1ed9ed01984e1212d17fc57f14 Mon Sep 17 00:00:00 2001 From: zhouhaibin <283595276@qq.com> Date: Mon, 13 Aug 2012 10:23:43 +0800 Subject: [PATCH] support weburi monitor order by function support weburi monitor order by function --- .../druid/support/JSONDruidStatService.java | 30 +++++-------------- .../support/http/resources/weburi.html | 4 +++ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java index 2f4013081f..c0349b5c0f 100644 --- a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java +++ b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java @@ -96,34 +96,15 @@ public class JSONDruidStatService { private List> getWebURIStatDataList(Map parameters) { List> array = WebAppStatManager.getInstance().getURIStatData(); - - - - - - - - - - - - - - - - - - return array; + return comparatorOrderBy(array, parameters); } private List> getWebSessionStatDataList(Map parameters) { List> array = WebAppStatManager.getInstance().getSessionStatData(); return array; } - - private List> getSqlStatDataList(Map parameters) { - List> array = druidStatManager.getSqlStatDataList(); - + + private List> comparatorOrderBy(List> array,Map parameters){ // when open the stat page before executing some sql if (array == null || array.isEmpty()) return null; @@ -162,6 +143,11 @@ public class JSONDruidStatService { return array.subList(fromIndex, toIndex); } + + private List> getSqlStatDataList(Map parameters) { + List> array = druidStatManager.getSqlStatDataList(); + return comparatorOrderBy(array, parameters); + } private String returnJSONActiveConnectionStackTrace(Integer id) { List result = druidStatManager.getActiveConnectionStackTraceByDataSourceId(id); diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 2139430a4a..51e9d0f972 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -39,4 +39,8 @@ + + \ No newline at end of file