diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index 28d40a91e1..ae554f6fa7 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -122,8 +122,7 @@ public final class DruidStatService implements DruidStatServiceMBean { } if (url.startsWith("/wall.json")) { - Object result = statManagerFacade.getWallStatMap(null); - return returnJSONResult(RESULT_CODE_SUCCESS, result); + return returnJSONResult(RESULT_CODE_SUCCESS, getWallStatMap(parameters)); } if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { @@ -276,7 +275,14 @@ public final class DruidStatService implements DruidStatServiceMBean { dataSourceId = Integer.parseInt(dataSourceIdParam); } - return statManagerFacade.getWallStatMap(dataSourceId); + Map result = statManagerFacade.getWallStatMap(dataSourceId); + List> sortedArray = comparatorOrderBy((List>)result.get("tables"), parameters); + result.put("tables", sortedArray); + + sortedArray = comparatorOrderBy((List>)result.get("functions"), parameters); + result.put("functions", sortedArray); + + return result; } private String getSqlStat(Integer id) { diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index eac8bd835f..e7d41f64a7 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -59,20 +59,20 @@ - +
- - - - - - - - - - - + + + + + + + + + + + @@ -80,8 +80,8 @@
Table NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountTable NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCount
- - + + @@ -91,66 +91,69 @@
Function NameInvokeCountFunction NameInvokeCount