From 2fe5124da9f060342af04ee9b6164b60b5a81815 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Wed, 6 Aug 2025 10:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/mapper/ReportMapper.java | 6 ++ .../persistence/service/ReportService.java | 6 ++ .../service/impl/ReportServiceImpl.java | 20 +++++-- .../mapper/xml/mysql/ReportMapper.xml | 26 +++++++++ .../routes/dashboard/home/home.component.html | 58 ++++++++++--------- .../routes/dashboard/home/home.component.less | 7 +++ .../routes/dashboard/home/home.component.ts | 13 ++++- .../src/assets/i18n/en-US.json | 5 +- .../src/assets/i18n/zh-CN.json | 13 +++-- .../src/assets/i18n/zh-TW.json | 13 +++-- .../web/contorller/DashboardController.java | 4 ++ 11 files changed, 128 insertions(+), 43 deletions(-) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java index ffdbb014a..357ea508d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java @@ -42,6 +42,12 @@ public interface ReportMapper extends IJpaMapper { public Integer analysisActiveUsers(HashMap reportParameter); + public Integer totalUsers(HashMap reportParameter); + + public Integer totalDepts(HashMap reportParameter); + + public Integer totalApps(HashMap reportParameter); + public List> analysisDayHour(HashMap reportParameter); public List> analysisMonth(HashMap reportParameter); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java index fa63889ef..ef4ad1f34 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java @@ -33,6 +33,12 @@ public interface ReportService extends IJpaService{ public Integer analysisActiveUsers(HashMap reportParameter); + public Integer totalUsers(HashMap reportParameter); + + public Integer totalDepts(HashMap reportParameter); + + public Integer totalApps(HashMap reportParameter); + public List> analysisDayHour(HashMap reportParameter); public List> analysisMonth(HashMap reportParameter); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java index b2dc341f8..7c68497ab 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/ReportServiceImpl.java @@ -32,19 +32,31 @@ public class ReportServiceImpl extends JpaServiceImpl i public Integer analysisDay(HashMap reportParameter) { return getMapper().analysisDay(reportParameter); - }; + } public Integer analysisNewUsers(HashMap reportParameter) { return getMapper().analysisNewUsers(reportParameter); - }; + } public Integer analysisOnlineUsers(HashMap reportParameter) { return getMapper().analysisOnlineUsers(reportParameter); - }; + } public Integer analysisActiveUsers(HashMap reportParameter) { return getMapper().analysisActiveUsers(reportParameter); - }; + } + + public Integer totalUsers(HashMap reportParameter) { + return getMapper().totalDepts(reportParameter); + } + + public Integer totalDepts(HashMap reportParameter) { + return getMapper().totalDepts(reportParameter); + } + + public Integer totalApps(HashMap reportParameter) { + return getMapper().totalApps(reportParameter); + } public List> analysisDayHour(HashMap reportParameter){ return getMapper().analysisDayHour(reportParameter); diff --git a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index c7ab4b37f..617e93426 100644 --- a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -135,5 +135,31 @@ limit 1000 + + + + + + + + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html index 1d2b84034..21989646f 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.html @@ -13,8 +13,8 @@
-
{{ onlineUsers }}
-

{{ 'mxk.home.onlineUsers' | i18n }}

+
{{ onlineUsers + '/' + totalUsers }}
+

{{ 'mxk.home.onlineUsers' | i18n }}/{{ 'mxk.home.totalUsers' | i18n }}

-
-
{{ dayCount }}
-

{{ 'mxk.home.dayCount' | i18n }}

-
-
- -
-
-
-
-
{{ newUsers }}

{{ 'mxk.home.newUsers' | i18n }}

@@ -70,11 +50,31 @@
+
+
+
+
{{ totalDepts }}
+

{{ 'mxk.home.totalDepts' | i18n }}

+
+
+ +
+
+
-
{{ activeUsers }}
-

{{ 'mxk.home.activeUsers' | i18n }}

+
{{ totalApps }}
+

{{ 'mxk.home.totalApps' | i18n }}

- {{ 'mxk.home.dayAccessCount' | i18n }} + {{ 'mxk.home.dayAccessCount' | i18n }}- + + {{ 'mxk.home.dayCount' | i18n }} + @@ -104,7 +107,10 @@
- {{ 'mxk.home.monthAccessCount' | i18n }} + {{ 'mxk.home.monthAccessCount' | i18n }}- + + {{ 'mxk.home.activeUsers' | i18n }} + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.less b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.less index e69de29bb..4cdc66454 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.less +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.less @@ -0,0 +1,7 @@ + .head-badge { + height: 20px; + border-radius: 4px; + color: #000; + display: inline-block; + vertical-align: middle; + } \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts index 02b688818..017c73530 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/dashboard/home/home.component.ts @@ -38,9 +38,15 @@ export class HomeComponent implements OnInit { //当月新增 newUsers!: any[]; //当月活动 - activeUsers!: any[]; + activeUsers!: number; //当天统计 - dayCount!: any[]; + dayCount!: number; + + totalUsers!: number; + + totalDepts!: number; + + totalApps!: number; //在线用户 onlineUsers!: any[]; //当日 @@ -108,6 +114,9 @@ export class HomeComponent implements OnInit { this.dayCount = res.data.dayCount; this.newUsers = res.data.newUsers; this.activeUsers = res.data.activeUsers; + this.totalDepts = res.data.totalDepts; + this.totalUsers = res.data.totalUsers; + this.totalApps = res.data.totalApps; const beginDay = new Date().getTime(); const fakeY = [7, 5, 4, 2, 4, 7, 5, 6, 5, 9, 6, 3, 1, 5, 3, 6, 5]; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json index 256ead1ef..8e9478a48 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json @@ -67,10 +67,13 @@ } }, "home": { - "onlineUsers": "Online Users", + "onlineUsers": "Online", "dayCount": "Day Count", "newUsers": "Month News", "activeUsers": "Month Actives", + "totalUsers": "Users", + "totalDepts": "Depts", + "totalApps": "Apps", "dayAccessCount": "Today Access Count", "monthAccessCount": "30 Day Access Count", "monthAppCount": "30 Day TOP 10 App Access Count", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json index f99a64962..24db644cf 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json @@ -66,12 +66,15 @@ } }, "home": { - "onlineUsers": "当前在线用户", - "dayCount": "当日访问量", + "onlineUsers": "在线", + "dayCount": "日访问量", "newUsers": "当月新增用户", - "activeUsers": "当月活动用户", - "dayAccessCount": "当日访问情况统计", - "monthAccessCount": "30日访问情况统计", + "activeUsers": "活动用户", + "totalUsers": "用户", + "totalDepts": "组织", + "totalApps": "应用", + "dayAccessCount": "当日访问统计", + "monthAccessCount": "30日访问统计", "monthAppCount": "30日TOP10应用访问统计", "monthBrowserCount": "30日TOP10浏览器访问统计", "monthProvinceAccessCount": "30日TOP10访问统计", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json index 85dbfbdc5..c3f72c525 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json @@ -67,12 +67,15 @@ } }, "home": { - "onlineUsers": "當前在線用戶", - "dayCount": "當日訪問量", + "onlineUsers": "在線", + "dayCount": "日訪問量", "newUsers": "當月新增用戶", - "activeUsers": "當月活動用戶", - "dayAccessCount": "當日訪問情況統計", - "monthAccessCount": "30日訪問情況統計", + "activeUsers": "活動用戶", + "totalUsers": "用户", + "totalDepts": "组织", + "totalApps": "应用", + "dayAccessCount": "當日訪問統計", + "monthAccessCount": "30日訪問統計", "monthAppCount": "30日TOP10應用訪問統計", "monthBrowserCount": "30日TOP10瀏覽器訪問統計", "monthProvinceAccessCount": "30日TOP10訪問統計", diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java index 6d79b7410..b8873e524 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/DashboardController.java @@ -53,6 +53,10 @@ public class DashboardController { reportParameter.put("onlineUsers", reportService.analysisOnlineUsers(reportParameter)); reportParameter.put("activeUsers", reportService.analysisActiveUsers(reportParameter)); + reportParameter.put("totalUsers", reportService.totalUsers(reportParameter)); + reportParameter.put("totalDepts", reportService.totalDepts(reportParameter)); + reportParameter.put("totalApps", reportService.totalApps(reportParameter)); + reportParameter.put("reportMonth", reportService.analysisMonth(reportParameter)); reportParameter.put("reportDayHour", reportService.analysisDayHour(reportParameter));