From 8f29faa0f2f8b7c0e1822ee1198c20b740c4e675 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 7 May 2024 17:26:02 +0800 Subject: [PATCH] Revert "Refactor(KtWrapper): Simplify KtWrapper" This reverts commit ab20c45f1f4ae9a45af6996ee2c39e75cb84a43f. --- .../api/service/permission/impl/UserServiceImpl.kt | 6 +++--- .../api/service/system/impl/SensitiveWordServiceImpl.kt | 8 +++++--- .../oxygen/api/service/tool/impl/EditServiceImpl.kt | 9 +++++---- .../api/service/tool/impl/ManagementServiceImpl.kt | 6 +++--- .../oxygen/api/service/tool/impl/ToolBaseServiceImpl.kt | 3 ++- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt index c82ddbf..059b22c 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt @@ -106,7 +106,7 @@ class UserServiceImpl( if (!passwordEncoder.matches(userChangePasswordParam.originalPassword, user.password)) { throw BadCredentialsException("Passwords do not match") } - val wrapper = ktUpdate() + val wrapper = KtUpdateWrapper(User()) .eq(User::id, user.id) .set(User::password, passwordEncoder.encode(userChangePasswordParam.newPassword)) .set(User::credentialsExpiration, null) @@ -220,7 +220,7 @@ class UserServiceImpl( this.updateById(user) this.update( - ktUpdate().eq(User::id, user.id) + KtUpdateWrapper(User()).eq(User::id, user.id) .set( User::verify, if (userUpdateParam.verified || userUpdateParam.id == 0L) null else "${ @@ -282,7 +282,7 @@ class UserServiceImpl( val user = this.getById(userUpdatePasswordParam.id) user?.let { - val wrapper = ktUpdate() + val wrapper = KtUpdateWrapper(User()) .eq(User::id, user.id) .set(User::password, passwordEncoder.encode(userUpdatePasswordParam.password)) .set( diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SensitiveWordServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SensitiveWordServiceImpl.kt index a591550..f60c2f0 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SensitiveWordServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SensitiveWordServiceImpl.kt @@ -1,5 +1,7 @@ package top.fatweb.oxygen.api.service.system.impl +import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper +import com.baomidou.mybatisplus.extension.kotlin.KtUpdateWrapper import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Propagation @@ -36,9 +38,9 @@ class SensitiveWordServiceImpl : ServiceImpl @Transactional(propagation = Propagation.REQUIRES_NEW) override fun update(sensitiveWordUpdateParam: SensitiveWordUpdateParam) { - this.update(ktUpdate().set(SensitiveWord::enable, false)) + this.update(KtUpdateWrapper(SensitiveWord()).set(SensitiveWord::enable, false)) this.update( - ktUpdate().`in`(SensitiveWord::id, sensitiveWordUpdateParam.ids) + KtUpdateWrapper(SensitiveWord()).`in`(SensitiveWord::id, sensitiveWordUpdateParam.ids) .set(SensitiveWord::enable, true) ) } @@ -50,7 +52,7 @@ class SensitiveWordServiceImpl : ServiceImpl @Transactional(propagation = Propagation.REQUIRES_NEW) override fun checkSensitiveWord(str: String) { - this.list(ktQuery().eq(SensitiveWord::enable, 1)).map(SensitiveWord::word).forEach { + this.list(KtQueryWrapper(SensitiveWord()).eq(SensitiveWord::enable, 1)).map(SensitiveWord::word).forEach { it ?: return@forEach try { diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/EditServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/EditServiceImpl.kt index 6007746..74e2208 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/EditServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/EditServiceImpl.kt @@ -1,6 +1,7 @@ package top.fatweb.oxygen.api.service.tool.impl import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper +import com.baomidou.mybatisplus.extension.kotlin.KtUpdateWrapper import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.dao.DuplicateKeyException @@ -63,7 +64,7 @@ class EditServiceImpl( override fun create(toolCreateParam: ToolCreateParam): ToolVo { val template = this.getTemplate(toolCreateParam.templateId!!) baseMapper.selectOne( - ktQuery() + KtQueryWrapper(Tool()) .eq(Tool::toolId, toolCreateParam.toolId!!) .eq(Tool::authorId, WebUtil.getLoginUserId()!!) .eq(Tool::platform, template.platform) @@ -244,7 +245,7 @@ class EditServiceImpl( throw ToolHasBeenPublishedException() } - return update(ktUpdate().eq(Tool::id, id).set(Tool::review, Tool.ReviewType.PROCESSING)) + return update(KtUpdateWrapper(Tool()).eq(Tool::id, id).set(Tool::review, Tool.ReviewType.PROCESSING)) } override fun cancel(id: Long): Boolean { @@ -256,13 +257,13 @@ class EditServiceImpl( throw ToolNotUnderReviewException() } - return update(ktUpdate().eq(Tool::id, id).set(Tool::review, Tool.ReviewType.NONE)) + return update(KtUpdateWrapper(Tool()).eq(Tool::id, id).set(Tool::review, Tool.ReviewType.NONE)) } @Transactional override fun delete(id: Long): Boolean { val tool = baseMapper.selectOne( - ktQuery().eq(Tool::id, id) + KtQueryWrapper(Tool()).eq(Tool::id, id) .eq(Tool::authorId, WebUtil.getLoginUserId()!!) ) ?: throw NoRecordFoundException() diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ManagementServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ManagementServiceImpl.kt index ae18c7c..4810eae 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ManagementServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ManagementServiceImpl.kt @@ -77,7 +77,7 @@ class ManagementServiceImpl( ) this.update( - ktUpdate() + KtUpdateWrapper(Tool()) .eq(Tool::id, id) .set(Tool::review, Tool.ReviewType.PASS) .set(Tool::publish, LocalDateTime.now(ZoneOffset.UTC).toInstant(ZoneOffset.UTC).toEpochMilli()) @@ -93,7 +93,7 @@ class ManagementServiceImpl( } this.update( - ktUpdate() + KtUpdateWrapper(Tool()) .eq(Tool::id, id) .set(Tool::review, Tool.ReviewType.REJECT) ) @@ -108,7 +108,7 @@ class ManagementServiceImpl( } this.update( - ktUpdate() + KtUpdateWrapper(Tool()) .eq(Tool::id, id) .set(Tool::review, Tool.ReviewType.REJECT) ) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ToolBaseServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ToolBaseServiceImpl.kt index c077601..237ba10 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ToolBaseServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/tool/impl/ToolBaseServiceImpl.kt @@ -1,5 +1,6 @@ package top.fatweb.oxygen.api.service.tool.impl +import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import org.springframework.stereotype.Service @@ -44,7 +45,7 @@ class ToolBaseServiceImpl( return ToolBaseConverter.toolBasePageToToolBasePageVo( this.page( basePage, - ktQuery().`in`( + KtQueryWrapper(ToolBase()).`in`( !toolBaseGetParam?.platform.isNullOrBlank(), ToolBase::platform, toolBaseGetParam?.platform?.split(",") -- 2.49.1