From 0f2d29831d93c880c4fe2f2ef917796b6c02ed15 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 7 May 2024 11:29:10 +0800 Subject: [PATCH] Refactor(Converter): Optimize Boolean type attribute conversion --- .../converter/permission/GroupConverter.kt | 4 +-- .../api/converter/permission/RoleConverter.kt | 4 +-- .../api/converter/system/SettingsConverter.kt | 2 +- .../api/converter/system/SysLogConverter.kt | 34 +++++++++---------- .../api/converter/tool/ToolBaseConverter.kt | 4 +-- .../converter/tool/ToolCategoryConverter.kt | 2 +- .../api/converter/tool/ToolConverter.kt | 2 +- .../converter/tool/ToolTemplateConverter.kt | 6 ++-- .../oxygen/api/vo/system/SensitiveWordVo.kt | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt index 28cbbd6..0f544e9 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt @@ -30,7 +30,7 @@ object GroupConverter { fun groupToGroupVo(group: Group) = GroupVo( id = group.id, name = group.name, - enable = group.enable == 1, + enable = group.enable?.let { it == 1}, createTime = group.createTime, updateTime = group.updateTime ) @@ -48,7 +48,7 @@ object GroupConverter { fun groupToGroupWithRoleVo(group: Group) = GroupWithRoleVo( id = group.id, name = group.name, - enable = group.enable == 1, + enable = group.enable?.let { it == 1}, createTime = group.createTime, updateTime = group.updateTime, roles = group.roles?.map(RoleConverter::roleToRoleVo) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt index 98f7375..f6bd0b7 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt @@ -30,7 +30,7 @@ object RoleConverter { fun roleToRoleVo(role: Role) = RoleVo( id = role.id, name = role.name, - enable = role.enable == 1, + enable = role.enable?.let { it == 1}, createTime = role.createTime, updateTime = role.updateTime ) @@ -48,7 +48,7 @@ object RoleConverter { fun roleToRoleWithPowerVo(role: Role) = RoleWithPowerVo( id = role.id, name = role.name, - enable = role.enable == 1, + enable = role.enable?.let { it == 1}, createTime = role.createTime, updateTime = role.updateTime, modules = role.modules?.map(ModuleConverter::moduleToModuleVo), diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SettingsConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SettingsConverter.kt index 2d7f717..8f2d554 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SettingsConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SettingsConverter.kt @@ -25,7 +25,7 @@ object SettingsConverter { id = sensitiveWord.id, word = sensitiveWord.word, useFor = sensitiveWord.useFor?.map(SensitiveWord.Use::valueOf)?.toSet(), - enable = sensitiveWord.enable == 1 + enable = sensitiveWord.enable?.let { it == 1} ) /** diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt index d94bd90..ce7f05c 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt @@ -29,24 +29,24 @@ object SysLogConverter { syslogPage.pages, syslogPage.size, syslogPage.current, - syslogPage.records.map { + syslogPage.records.map { sysLog -> SysLogVo( - id = it.id, - logType = it.logType, - operateUserId = it.operateUserId, - operateTime = it.operateTime, - requestUri = it.requestUri, - requestMethod = it.requestMethod, - requestParams = it.requestParams, - requestIp = it.requestIp, - requestServerAddress = it.requestServerAddress, - exception = it.exception == 1, - exceptionInfo = it.exceptionInfo, - startTime = it.startTime, - endTime = it.endTime, - executeTime = it.executeTime, - userAgent = it.userAgent, - operateUsername = it.operateUsername + id = sysLog.id, + logType = sysLog.logType, + operateUserId = sysLog.operateUserId, + operateTime = sysLog.operateTime, + requestUri = sysLog.requestUri, + requestMethod = sysLog.requestMethod, + requestParams = sysLog.requestParams, + requestIp = sysLog.requestIp, + requestServerAddress = sysLog.requestServerAddress, + exception = sysLog.exception?.let { it == 1}, + exceptionInfo = sysLog.exceptionInfo, + startTime = sysLog.startTime, + endTime = sysLog.endTime, + executeTime = sysLog.executeTime, + userAgent = sysLog.userAgent, + operateUsername = sysLog.operateUsername ) }) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolBaseConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolBaseConverter.kt index d37c56f..fb76be6 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolBaseConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolBaseConverter.kt @@ -29,7 +29,7 @@ object ToolBaseConverter { source = toolBase.source?.let(ToolDataConverter::toolDataToToolDataVo), dist = toolBase.dist?.let(ToolDataConverter::toolDataToToolDataVo), platform = toolBase.platform, - compiled = toolBase.compiled == 1, + compiled = toolBase.compiled?.let { it == 1}, createTime = toolBase.createTime, updateTime = toolBase.updateTime ) @@ -50,7 +50,7 @@ object ToolBaseConverter { source = ToolDataVo(id = toolBase.sourceId, data = null, createTime = null, updateTime = null), dist = ToolDataVo(id = toolBase.distId, data = null, createTime = null, updateTime = null), platform = toolBase.platform, - compiled = toolBase.compiled == 1, + compiled = toolBase.compiled?.let { it == 1}, createTime = toolBase.createTime, updateTime = toolBase.updateTime ) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolCategoryConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolCategoryConverter.kt index f01feb8..9efcb6f 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolCategoryConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolCategoryConverter.kt @@ -25,7 +25,7 @@ object ToolCategoryConverter { fun toolCategoryToToolCategoryVo(toolCategory: ToolCategory) = ToolCategoryVo( id = toolCategory.id, name = toolCategory.name, - enable = toolCategory.enable == 1, + enable = toolCategory.enable?.let { it == 1}, createTime = toolCategory.createTime, updateTime = toolCategory.updateTime ) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolConverter.kt index 19f54ba..249b69d 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolConverter.kt @@ -42,7 +42,7 @@ object ToolConverter { review = tool.review, createTime = tool.createTime, updateTime = tool.updateTime, - favorite = tool.favorite == 1 + favorite = tool.favorite?.let { it == 1} ) /** diff --git a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolTemplateConverter.kt b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolTemplateConverter.kt index ccb8233..7fb5663 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolTemplateConverter.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolTemplateConverter.kt @@ -31,7 +31,7 @@ object ToolTemplateConverter { source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo), platform = toolTemplate.platform, entryPoint = toolTemplate.entryPoint, - enable = toolTemplate.enable == 1, + enable = toolTemplate.enable?.let { it == 1}, createTime = toolTemplate.createTime, updateTime = toolTemplate.updateTime ) @@ -72,7 +72,7 @@ object ToolTemplateConverter { source = ToolDataVo(id = toolTemplate.sourceId, data = null, createTime = null, updateTime = null), platform = toolTemplate.platform, entryPoint = toolTemplate.entryPoint, - enable = toolTemplate.enable == 1, + enable = toolTemplate.enable?.let { it == 1}, createTime = toolTemplate.createTime, updateTime = toolTemplate.updateTime ) @@ -99,7 +99,7 @@ object ToolTemplateConverter { source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo), platform = toolTemplate.platform, entryPoint = toolTemplate.entryPoint, - enable = toolTemplate.enable == 1, + enable = toolTemplate.enable?.let { it == 1}, createTime = toolTemplate.createTime, updateTime = toolTemplate.updateTime ) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SensitiveWordVo.kt b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SensitiveWordVo.kt index 926e4e1..5b547fc 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SensitiveWordVo.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/vo/system/SensitiveWordVo.kt @@ -48,5 +48,5 @@ data class SensitiveWordVo( * @since 1.0.0 */ @Schema(description = "启用") - val enable: Boolean + val enable: Boolean? ) -- 2.49.1