FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Refactor(Converter): Optimize Boolean type attribute conversion

Browse Source
This commit is contained in:
Fat Snake
2024-05-07 11:29:10 +08:00
parent 5792a64a66
commit 0f2d29831d
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/top/fatweb/oxygen/api/converter/permission/GroupConverter.kt
View File

@@ -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)

4
src/main/kotlin/top/fatweb/oxygen/api/converter/permission/RoleConverter.kt
View File

@@ -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),

2
src/main/kotlin/top/fatweb/oxygen/api/converter/system/SettingsConverter.kt
View File

@@ -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}
)
/**

34
src/main/kotlin/top/fatweb/oxygen/api/converter/system/SysLogConverter.kt
View File

@@ -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
)
})

4
src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolBaseConverter.kt
View File

@@ -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
)

2
src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolCategoryConverter.kt
View File

@@ -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
)

2
src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolConverter.kt
View File

@@ -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}
)
/**

6
src/main/kotlin/top/fatweb/oxygen/api/converter/tool/ToolTemplateConverter.kt
View File

@@ -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
)

2
src/main/kotlin/top/fatweb/oxygen/api/vo/system/SensitiveWordVo.kt
View File

@@ -48,5 +48,5 @@ data class SensitiveWordVo(
* @since 1.0.0
*/
@Schema(description = "启用")
val enable: Boolean
val enable: Boolean?
)