Refactor(Converter): Optimize Boolean type attribute conversion #25

Merged
FatttSnake merged 1 commits from FatttSnake into dev 2024-05-07 11:30:12 +08:00
9 changed files with 30 additions and 30 deletions

View File

@@ -30,7 +30,7 @@ object GroupConverter {
fun groupToGroupVo(group: Group) = GroupVo( fun groupToGroupVo(group: Group) = GroupVo(
id = group.id, id = group.id,
name = group.name, name = group.name,
enable = group.enable == 1, enable = group.enable?.let { it == 1},
createTime = group.createTime, createTime = group.createTime,
updateTime = group.updateTime updateTime = group.updateTime
) )
@@ -48,7 +48,7 @@ object GroupConverter {
fun groupToGroupWithRoleVo(group: Group) = GroupWithRoleVo( fun groupToGroupWithRoleVo(group: Group) = GroupWithRoleVo(
id = group.id, id = group.id,
name = group.name, name = group.name,
enable = group.enable == 1, enable = group.enable?.let { it == 1},
createTime = group.createTime, createTime = group.createTime,
updateTime = group.updateTime, updateTime = group.updateTime,
roles = group.roles?.map(RoleConverter::roleToRoleVo) roles = group.roles?.map(RoleConverter::roleToRoleVo)

View File

@@ -30,7 +30,7 @@ object RoleConverter {
fun roleToRoleVo(role: Role) = RoleVo( fun roleToRoleVo(role: Role) = RoleVo(
id = role.id, id = role.id,
name = role.name, name = role.name,
enable = role.enable == 1, enable = role.enable?.let { it == 1},
createTime = role.createTime, createTime = role.createTime,
updateTime = role.updateTime updateTime = role.updateTime
) )
@@ -48,7 +48,7 @@ object RoleConverter {
fun roleToRoleWithPowerVo(role: Role) = RoleWithPowerVo( fun roleToRoleWithPowerVo(role: Role) = RoleWithPowerVo(
id = role.id, id = role.id,
name = role.name, name = role.name,
enable = role.enable == 1, enable = role.enable?.let { it == 1},
createTime = role.createTime, createTime = role.createTime,
updateTime = role.updateTime, updateTime = role.updateTime,
modules = role.modules?.map(ModuleConverter::moduleToModuleVo), modules = role.modules?.map(ModuleConverter::moduleToModuleVo),

View File

@@ -25,7 +25,7 @@ object SettingsConverter {
id = sensitiveWord.id, id = sensitiveWord.id,
word = sensitiveWord.word, word = sensitiveWord.word,
useFor = sensitiveWord.useFor?.map(SensitiveWord.Use::valueOf)?.toSet(), useFor = sensitiveWord.useFor?.map(SensitiveWord.Use::valueOf)?.toSet(),
enable = sensitiveWord.enable == 1 enable = sensitiveWord.enable?.let { it == 1}
) )
/** /**

View File

@@ -29,24 +29,24 @@ object SysLogConverter {
syslogPage.pages, syslogPage.pages,
syslogPage.size, syslogPage.size,
syslogPage.current, syslogPage.current,
syslogPage.records.map { syslogPage.records.map { sysLog ->
SysLogVo( SysLogVo(
id = it.id, id = sysLog.id,
logType = it.logType, logType = sysLog.logType,
operateUserId = it.operateUserId, operateUserId = sysLog.operateUserId,
operateTime = it.operateTime, operateTime = sysLog.operateTime,
requestUri = it.requestUri, requestUri = sysLog.requestUri,
requestMethod = it.requestMethod, requestMethod = sysLog.requestMethod,
requestParams = it.requestParams, requestParams = sysLog.requestParams,
requestIp = it.requestIp, requestIp = sysLog.requestIp,
requestServerAddress = it.requestServerAddress, requestServerAddress = sysLog.requestServerAddress,
exception = it.exception == 1, exception = sysLog.exception?.let { it == 1},
exceptionInfo = it.exceptionInfo, exceptionInfo = sysLog.exceptionInfo,
startTime = it.startTime, startTime = sysLog.startTime,
endTime = it.endTime, endTime = sysLog.endTime,
executeTime = it.executeTime, executeTime = sysLog.executeTime,
userAgent = it.userAgent, userAgent = sysLog.userAgent,
operateUsername = it.operateUsername operateUsername = sysLog.operateUsername
) )
}) })

View File

@@ -29,7 +29,7 @@ object ToolBaseConverter {
source = toolBase.source?.let(ToolDataConverter::toolDataToToolDataVo), source = toolBase.source?.let(ToolDataConverter::toolDataToToolDataVo),
dist = toolBase.dist?.let(ToolDataConverter::toolDataToToolDataVo), dist = toolBase.dist?.let(ToolDataConverter::toolDataToToolDataVo),
platform = toolBase.platform, platform = toolBase.platform,
compiled = toolBase.compiled == 1, compiled = toolBase.compiled?.let { it == 1},
createTime = toolBase.createTime, createTime = toolBase.createTime,
updateTime = toolBase.updateTime updateTime = toolBase.updateTime
) )
@@ -50,7 +50,7 @@ object ToolBaseConverter {
source = ToolDataVo(id = toolBase.sourceId, data = null, createTime = null, updateTime = null), source = ToolDataVo(id = toolBase.sourceId, data = null, createTime = null, updateTime = null),
dist = ToolDataVo(id = toolBase.distId, data = null, createTime = null, updateTime = null), dist = ToolDataVo(id = toolBase.distId, data = null, createTime = null, updateTime = null),
platform = toolBase.platform, platform = toolBase.platform,
compiled = toolBase.compiled == 1, compiled = toolBase.compiled?.let { it == 1},
createTime = toolBase.createTime, createTime = toolBase.createTime,
updateTime = toolBase.updateTime updateTime = toolBase.updateTime
) )

View File

@@ -25,7 +25,7 @@ object ToolCategoryConverter {
fun toolCategoryToToolCategoryVo(toolCategory: ToolCategory) = ToolCategoryVo( fun toolCategoryToToolCategoryVo(toolCategory: ToolCategory) = ToolCategoryVo(
id = toolCategory.id, id = toolCategory.id,
name = toolCategory.name, name = toolCategory.name,
enable = toolCategory.enable == 1, enable = toolCategory.enable?.let { it == 1},
createTime = toolCategory.createTime, createTime = toolCategory.createTime,
updateTime = toolCategory.updateTime updateTime = toolCategory.updateTime
) )

View File

@@ -42,7 +42,7 @@ object ToolConverter {
review = tool.review, review = tool.review,
createTime = tool.createTime, createTime = tool.createTime,
updateTime = tool.updateTime, updateTime = tool.updateTime,
favorite = tool.favorite == 1 favorite = tool.favorite?.let { it == 1}
) )
/** /**

View File

@@ -31,7 +31,7 @@ object ToolTemplateConverter {
source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo), source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo),
platform = toolTemplate.platform, platform = toolTemplate.platform,
entryPoint = toolTemplate.entryPoint, entryPoint = toolTemplate.entryPoint,
enable = toolTemplate.enable == 1, enable = toolTemplate.enable?.let { it == 1},
createTime = toolTemplate.createTime, createTime = toolTemplate.createTime,
updateTime = toolTemplate.updateTime updateTime = toolTemplate.updateTime
) )
@@ -72,7 +72,7 @@ object ToolTemplateConverter {
source = ToolDataVo(id = toolTemplate.sourceId, data = null, createTime = null, updateTime = null), source = ToolDataVo(id = toolTemplate.sourceId, data = null, createTime = null, updateTime = null),
platform = toolTemplate.platform, platform = toolTemplate.platform,
entryPoint = toolTemplate.entryPoint, entryPoint = toolTemplate.entryPoint,
enable = toolTemplate.enable == 1, enable = toolTemplate.enable?.let { it == 1},
createTime = toolTemplate.createTime, createTime = toolTemplate.createTime,
updateTime = toolTemplate.updateTime updateTime = toolTemplate.updateTime
) )
@@ -99,7 +99,7 @@ object ToolTemplateConverter {
source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo), source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo),
platform = toolTemplate.platform, platform = toolTemplate.platform,
entryPoint = toolTemplate.entryPoint, entryPoint = toolTemplate.entryPoint,
enable = toolTemplate.enable == 1, enable = toolTemplate.enable?.let { it == 1},
createTime = toolTemplate.createTime, createTime = toolTemplate.createTime,
updateTime = toolTemplate.updateTime updateTime = toolTemplate.updateTime
) )

View File

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