⚡️(wayzer/user/ban) 使用Dao代替entity，提高性能和兼容性

Author: way-zer

scripts/wayzer/user/ban.dao.kt

@@ -1,23 +1,30 @@
 package wayzer.user
 
-import org.jetbrains.exposed.dao.IntEntity
-import org.jetbrains.exposed.dao.IntEntityClass
-import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.and
+import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.javatime.CurrentTimestamp
 import org.jetbrains.exposed.sql.javatime.timestamp
+import org.jetbrains.exposed.sql.transactions.transaction
 import wayzer.lib.PlayerData
 import java.time.Duration
 import java.time.Instant
 
-class PlayerBan(id: EntityID<Int>) : IntEntity(id) {
-    var ids by T.ids
-    var reason by T.reason
-    var operator by T.operator
-    val createTime by T.createTime
-    var endTime by T.endTime
+data class PlayerBan(
+    val id: Int,
+    val ids: String,
+    val reason: String,
+    val operator: String?,
+    val createTime: Instant,
+    val endTime: Instant
+) {
+    constructor(row: ResultRow) : this(
+        row[T.id].value,
+        row[T.ids],
+        row[T.reason],
+        row[T.operator],
+        row[T.createTime],
+        row[T.endTime]
+    )
 
     object T : IntIdTable("PlayerBanV2") {
         val ids = text("ids", eagerLoading = true)
@@ -27,21 +34,30 @@ class PlayerBan(id: EntityID<Int>) : IntEntity(id) {
         val endTime = timestamp("endTime").defaultExpression(CurrentTimestamp)
     }
 
-    companion object : IntEntityClass<PlayerBan>(T) {
-        fun create(ids: PlayerData, time: Duration, reason: String, operator: String?): PlayerBan {
-            return new {
-                this.ids = ids.idsInDB
-                endTime = Instant.now() + time
-                this.operator = operator
-                this.reason = reason
+    companion object {
+        fun create(ids: PlayerData, time: Duration, reason: String, operator: String?): PlayerBan = transaction {
+            val ban = T.insertReturning {
+                it[T.ids] = ids.idsInDB
+                it[T.endTime] = Instant.now() + time
+                it[T.operator] = operator
+                it[T.reason] = reason
             }
+            PlayerBan(ban.first())
         }
 
-        fun allNotEnd() = find(T.endTime.greater(CurrentTimestamp))
+        fun allNotEnd() = transaction {
+            T.selectAll().where { T.endTime.greater(CurrentTimestamp) }
+                .map { PlayerBan(it) }
+        }
+
+        fun findNotEnd(id: String): PlayerBan? = transaction {
+            T.selectAll().where { (T.ids like "%$${id}$%") and T.endTime.greater(CurrentTimestamp) }.firstOrNull()
+                ?.let { PlayerBan(it) }
+        }
 
-        fun findNotEnd(id: String): PlayerBan? {
-            return find { (T.ids like "%$${id}$%") and (T.endTime.greater(CurrentTimestamp)) }
-                .firstOrNull()
+        fun delete(id: Int): PlayerBan? = transaction {
+            T.deleteReturning { T.id eq id }.firstOrNull()
+                ?.let { PlayerBan(it) }
         }
     }
 }

scripts/wayzer/user/ban.kts

@@ -3,7 +3,6 @@
 package wayzer.user
 
 import coreLibrary.DBApi.DB.registerTable
-import org.jetbrains.exposed.sql.transactions.transaction
 import java.text.DateFormat
 import java.time.Duration
 import java.time.Instant
@@ -27,7 +26,7 @@ fun Player.kick(ban: PlayerBan) {
 
 listen<EventType.PlayerConnect> {
     launch(Dispatchers.IO) {
-        val ban = transaction { PlayerBan.findNotEnd(PlayerData[it.player].id) } ?: return@launch
+        val ban = PlayerBan.findNotEnd(PlayerData[it.player].id) ?: return@launch
         withContext(Dispatchers.game) {
             it.player.kick(ban)
         }
@@ -36,12 +35,10 @@ listen<EventType.PlayerConnect> {
 
 suspend fun ban(player: PlayerData, time: Int, reason: String, operate: Player?) {
     val ban = withContext(Dispatchers.IO) {
-        transaction {
-            PlayerBan.create(
-                player, Duration.ofMinutes(time.toLong()), reason,
-                operate?.let { PlayerData[it].id }
-            ).also { it.flush() }
-        }
+        PlayerBan.create(
+            player, Duration.ofMinutes(time.toLong()), reason,
+            operate?.let { PlayerData[it].id }
+        )
     }
     Groups.player.filter { PlayerData[it].id in player.ids }.forEach {
         it.kick(ban)
@@ -72,9 +69,7 @@ command("unbanX", "管理指令: 解禁") {
     body {
         if (arg.isEmpty()) replyUsage()
         val id = arg[0].toIntOrNull() ?: replyUsage()
-        val ban = transaction {
-            PlayerBan.findById(id)?.also { it.delete() }
-        } ?: returnReply("[red]找不到封禁记录，检查ID是否正确".with())
+        val ban = PlayerBan.delete(id) ?: returnReply("[red]找不到封禁记录，检查ID是否正确".with())
         logger.info("unban ${ban.ids} ${ban.endTime} ${ban.reason}")
         reply("[green]解禁成功, 禁封原因: {reason}".with("reason" to ban.reason))
     }