🔥 feat: 获取用户统计数据

spcookie · Jan 30, 2024 · b3a183f · b3a183f
1 parent b1e66e0
commit b3a183f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/tokisaki-api/src/main/kotlin/io/micro/api/user/dto/UserStatisticsDTO.kt b/tokisaki-api/src/main/kotlin/io/micro/api/user/dto/UserStatisticsDTO.kt
@@ -10,4 +10,7 @@ class UserStatisticsDTO {
     @Schema(title = "在线人数")
     var onlineUserCount: Int? = null
 
+    @Schema(title = "注册人数")
+    var enrollUserCount: Long? = null
+
 }
diff --git a/tokisaki-server/src/main/kotlin/io/micro/server/auth/domain/model/entity/UserStatisticsDO.kt b/tokisaki-server/src/main/kotlin/io/micro/server/auth/domain/model/entity/UserStatisticsDO.kt
@@ -6,4 +6,6 @@ class UserStatisticsDO : BaseDomainEntity() {
 
     var onlineUserCount: Int? = null
 
+    var enrollUserCount: Long? = null
+
 }
diff --git a/tokisaki-server/src/main/kotlin/io/micro/server/auth/domain/service/impl/AuthServiceImpl.kt b/tokisaki-server/src/main/kotlin/io/micro/server/auth/domain/service/impl/AuthServiceImpl.kt
@@ -113,17 +113,23 @@ class AuthServiceImpl(private val authRepository: IAuthRepository) : AuthService
             .flatMap { authRepository.updateUserAuthorityRelation(id, it.toList()) }
     }
 
+    @WithTransaction
     override fun getUserStatistics(): Uni<UserStatisticsDO> {
-        return authRepository.findAllUserLastLoginTime()
-            .map { lastLoginTime ->
-                val currentTimeMillis = System.currentTimeMillis()
-                lastLoginTime.filterValues {
-                    Duration.ofMillis(currentTimeMillis - it).toMinutes() < ONLINE_SURVIVAL_MINUTES
-                }.count()
+        return Uni.createFrom().item(UserStatisticsDO())
+            .flatMap { statistics ->
+                authRepository.findAllUserLastLoginTime()
+                    .map { lastLoginTime ->
+                        val currentTimeMillis = System.currentTimeMillis()
+                        val count = lastLoginTime.filterValues {
+                            Duration.ofMillis(currentTimeMillis - it).toMinutes() < ONLINE_SURVIVAL_MINUTES
+                        }.count()
+                        statistics.apply { onlineUserCount = count }
+                    }
+
             }
-            .map {
-                UserStatisticsDO().apply {
-                    onlineUserCount = it
+            .flatMap { statistics ->
+                authRepository.countUser().map {
+                    statistics.apply { enrollUserCount = it }
                 }
             }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,6 @@ class UserStatisticsDO : BaseDomainEntity() {

		var onlineUserCount: Int? = null

		var enrollUserCount: Long? = null

		}