Optimize ToolBase and ToolTemplate api
This commit is contained in:
@@ -25,11 +25,6 @@ class BaseController(
|
||||
fun get(): ResponseResult<List<ToolBaseVo>> =
|
||||
ResponseResult.databaseSuccess(data = toolBaseService.get())
|
||||
|
||||
@Operation(summary = "获取基板列表")
|
||||
@GetMapping("/list")
|
||||
fun getList(): ResponseResult<List<ToolBaseVo>> =
|
||||
ResponseResult.databaseSuccess(data = toolBaseService.getList())
|
||||
|
||||
@Operation(summary = "新增基板")
|
||||
@PostMapping
|
||||
fun add(@RequestBody @Valid toolBaseAddParam: ToolBaseAddParam): ResponseResult<ToolBaseVo> =
|
||||
|
||||
@@ -7,10 +7,8 @@ object ToolTemplateConverter {
|
||||
fun toolTemplateToToolTemplateVo(toolTemplate: ToolTemplate) = ToolTemplateVo(
|
||||
id = toolTemplate.id,
|
||||
name = toolTemplate.name,
|
||||
ver = toolTemplate.ver,
|
||||
baseId = toolTemplate.baseId,
|
||||
base = toolTemplate.base?.let(ToolBaseConverter::toolBaseToToolBaseVo),
|
||||
source = toolTemplate.source?.let(ToolDataConverter::toolDataToToolDataVo),
|
||||
dist = toolTemplate.dist?.let(ToolDataConverter::toolDataToToolDataVo),
|
||||
createTime = toolTemplate.createTime,
|
||||
updateTime = toolTemplate.updateTime,
|
||||
enable = toolTemplate.enable == 1
|
||||
|
||||
@@ -29,15 +29,6 @@ class ToolTemplate {
|
||||
@TableField("name")
|
||||
var name: String? = null
|
||||
|
||||
/**
|
||||
* ver
|
||||
*
|
||||
* @author FatttSnake, fatttsnake@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@TableField("ver")
|
||||
var ver: String? = null
|
||||
|
||||
/**
|
||||
* Base ID
|
||||
*
|
||||
@@ -56,15 +47,6 @@ class ToolTemplate {
|
||||
@TableField("source_id")
|
||||
var sourceId: Long? = null
|
||||
|
||||
/**
|
||||
* Dist ID
|
||||
*
|
||||
* @author FatttSnake, fatttsnake@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@TableField("dist_id")
|
||||
var distId: Long? = null
|
||||
|
||||
/**
|
||||
* Enable
|
||||
*
|
||||
@@ -124,15 +106,15 @@ class ToolTemplate {
|
||||
var source: ToolData? = null
|
||||
|
||||
/**
|
||||
* Dist
|
||||
* Base
|
||||
*
|
||||
* @author FatttSnake, fatttsnake@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
var dist: ToolData? = null
|
||||
var base: ToolBase? = null
|
||||
|
||||
override fun toString(): String {
|
||||
return "ToolTemplate(id=$id, name=$name, ver=$ver, baseId=$baseId, sourceId=$sourceId, distId=$distId, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
|
||||
return "ToolTemplate(id=$id, name=$name, baseId=$baseId, sourceId=$sourceId, enable=$enable, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version, source=$source, base=$base)"
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,4 @@ import top.fatweb.oxygen.api.entity.tool.ToolBase
|
||||
@Mapper
|
||||
interface ToolBaseMapper : BaseMapper<ToolBase> {
|
||||
fun selectOne(@Param("id") id: Long): ToolBase?
|
||||
|
||||
fun selectList(): List<ToolBase>
|
||||
}
|
||||
@@ -2,24 +2,15 @@ package top.fatweb.oxygen.api.param.tool
|
||||
|
||||
import jakarta.validation.constraints.NotBlank
|
||||
import jakarta.validation.constraints.NotNull
|
||||
import jakarta.validation.constraints.Pattern
|
||||
|
||||
data class ToolTemplateAddParam(
|
||||
@field: NotBlank(message = "Name can not be blank")
|
||||
val name: String?,
|
||||
|
||||
@field: NotBlank(message = "Ver can not be blank")
|
||||
@field: Pattern(regexp = "^\\d+\\.\\d+\\.\\d+\$", message = "Ver can only match '<number>.<number>.<number>'")
|
||||
val ver: String?,
|
||||
|
||||
@field: NotNull(message = "BaseId can not be null")
|
||||
val baseId: Long? = null,
|
||||
|
||||
@field: NotNull(message = "Source can not be null")
|
||||
val source: String?,
|
||||
|
||||
@field:NotNull(message = "Dist can not be null")
|
||||
val dist: String?,
|
||||
val source: String = "",
|
||||
|
||||
val enable: Boolean = true
|
||||
)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package top.fatweb.oxygen.api.param.tool
|
||||
|
||||
import jakarta.validation.constraints.NotNull
|
||||
import jakarta.validation.constraints.Pattern
|
||||
|
||||
data class ToolTemplateUpdateParam(
|
||||
@field: NotNull(message = "ID can not be null")
|
||||
@@ -9,14 +8,9 @@ data class ToolTemplateUpdateParam(
|
||||
|
||||
val name: String?,
|
||||
|
||||
@field: Pattern(regexp = "^\\d+\\.\\d+\\.\\d+\$", message = "Ver can only match '<number>.<number>.<number>'")
|
||||
val ver: String?,
|
||||
|
||||
val baseId: Long?,
|
||||
|
||||
val source: String?,
|
||||
|
||||
val dist: String?,
|
||||
|
||||
val enable: Boolean?
|
||||
)
|
||||
|
||||
@@ -19,8 +19,6 @@ interface IToolBaseService : IService<ToolBase> {
|
||||
|
||||
fun get(): List<ToolBaseVo>
|
||||
|
||||
fun getList(): List<ToolBaseVo>
|
||||
|
||||
fun add(toolBaseAddParam: ToolBaseAddParam): ToolBaseVo
|
||||
|
||||
fun update(toolBaseUpdateParam: ToolBaseUpdateParam): ToolBaseVo
|
||||
|
||||
@@ -31,8 +31,7 @@ class ToolBaseServiceImpl(
|
||||
override fun getOne(id: Long): ToolBaseVo =
|
||||
baseMapper.selectOne(id)?.let(ToolBaseConverter::toolBaseToToolBaseVo) ?: throw NoRecordFoundException()
|
||||
|
||||
override fun get(): List<ToolBaseVo> = baseMapper.selectList().map(ToolBaseConverter::toolBaseToToolBaseVo)
|
||||
override fun getList(): List<ToolBaseVo> = this.list().map(ToolBaseConverter::toolBaseToToolBaseVoByGetList)
|
||||
override fun get(): List<ToolBaseVo> = this.list().map(ToolBaseConverter::toolBaseToToolBaseVoByGetList)
|
||||
|
||||
@Transactional
|
||||
override fun add(toolBaseAddParam: ToolBaseAddParam): ToolBaseVo {
|
||||
|
||||
@@ -42,19 +42,14 @@ class ToolTemplateServiceImpl(
|
||||
toolBaseService.getOne(toolTemplateAddParam.baseId!!)
|
||||
|
||||
val newSource = ToolData().apply { data = toolTemplateAddParam.source }
|
||||
val newDist = ToolData().apply { data = toolTemplateAddParam.dist }
|
||||
|
||||
toolDataService.save(newSource)
|
||||
toolDataService.save(newDist)
|
||||
|
||||
val toolTemplate = ToolTemplate().apply {
|
||||
name = toolTemplateAddParam.name
|
||||
ver = toolTemplateAddParam.ver
|
||||
baseId = toolTemplateAddParam.baseId
|
||||
sourceId = newSource.id
|
||||
distId = newDist.id
|
||||
source = newSource
|
||||
dist = newDist
|
||||
enable = if (toolTemplateAddParam.enable) 1 else 0
|
||||
}
|
||||
|
||||
@@ -73,15 +68,9 @@ class ToolTemplateServiceImpl(
|
||||
data = toolTemplateUpdateParam.source
|
||||
})
|
||||
|
||||
toolDataService.updateById(ToolData().apply {
|
||||
id = toolTemplate.distId
|
||||
data = toolTemplateUpdateParam.dist
|
||||
})
|
||||
|
||||
this.updateById(ToolTemplate().apply {
|
||||
id = toolTemplateUpdateParam.id
|
||||
name = toolTemplateUpdateParam.name
|
||||
ver = toolTemplateUpdateParam.ver
|
||||
baseId = toolTemplateUpdateParam.baseId
|
||||
enable = toolTemplateUpdateParam.enable?.let { if (it) 1 else 0 }
|
||||
})
|
||||
@@ -93,7 +82,7 @@ class ToolTemplateServiceImpl(
|
||||
override fun delete(id: Long): Boolean {
|
||||
val toolTemplate = this.getById(id)
|
||||
|
||||
return toolDataService.removeBatchByIds(listOf(toolTemplate.sourceId, toolTemplate.distId))
|
||||
return toolDataService.removeById(toolTemplate.sourceId)
|
||||
&& this.removeById(id)
|
||||
}
|
||||
}
|
||||
@@ -10,15 +10,10 @@ data class ToolTemplateVo(
|
||||
|
||||
val name: String?,
|
||||
|
||||
val ver: String?,
|
||||
|
||||
@JsonSerialize(using = ToStringSerializer::class)
|
||||
val baseId: Long?,
|
||||
val base: ToolBaseVo?,
|
||||
|
||||
val source: ToolDataVo?,
|
||||
|
||||
val dist: ToolDataVo?,
|
||||
|
||||
val enable: Boolean?,
|
||||
|
||||
val createTime: LocalDateTime?,
|
||||
|
||||
Reference in New Issue
Block a user