|
|
@@ -2,16 +2,17 @@ package com.gxzc.zen.web.sys.controller
|
|
|
|
|
|
import com.baomidou.kisso.annotation.Action
|
|
|
import com.baomidou.kisso.annotation.Login
|
|
|
-import com.gxzc.zen.api.sys.model.SysDic
|
|
|
import com.gxzc.zen.api.sys.model.SysParam
|
|
|
import com.gxzc.zen.api.sys.service.ISysParamService
|
|
|
import com.gxzc.zen.common.base.BaseController
|
|
|
import com.gxzc.zen.common.config.response.annotation.ZenResponseFilter
|
|
|
import com.gxzc.zen.common.dto.ResponseDto
|
|
|
+import com.gxzc.zen.common.util.LogicPagination
|
|
|
import org.slf4j.LoggerFactory
|
|
|
import org.springframework.beans.factory.annotation.Autowired
|
|
|
import org.springframework.http.ResponseEntity
|
|
|
import org.springframework.web.bind.annotation.*
|
|
|
+import java.net.URI
|
|
|
|
|
|
/**
|
|
|
* 系统参数控制器
|
|
|
@@ -23,7 +24,7 @@ import org.springframework.web.bind.annotation.*
|
|
|
@RequestMapping("sys/param")
|
|
|
class SysParamController : BaseController() {
|
|
|
companion object {
|
|
|
- private val logger = LoggerFactory.getLogger(SysParamController::class.java)
|
|
|
+ private val logger = LoggerFactory.getLogger(SysDicController::class.java)
|
|
|
}
|
|
|
|
|
|
@Autowired
|
|
|
@@ -31,26 +32,81 @@ class SysParamController : BaseController() {
|
|
|
|
|
|
@GetMapping("/list")
|
|
|
@Login(action = Action.Skip)
|
|
|
- @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
- fun getList(): ResponseEntity<*> {
|
|
|
+ @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
+ fun getList(@RequestParam(required = false) keyword: String?,
|
|
|
+ @RequestParam(required = false) searchOption: Int?,
|
|
|
+ @RequestParam(required = false) current: Int?,
|
|
|
+ @RequestParam(required = false) pageSize: Int?): ResponseEntity<*> {
|
|
|
+ var data: MutableList<SysParam> = sysParamService.getListCacheable()
|
|
|
+ if (!keyword.isNullOrEmpty()) {
|
|
|
+ data = data.filter {
|
|
|
+ when (searchOption) {
|
|
|
+ 1 -> run {
|
|
|
+ if (it.key != null) {
|
|
|
+ keyword!! in it.key!!
|
|
|
+ } else {
|
|
|
+ false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ 2 -> run {
|
|
|
+ if (it.label != null) {
|
|
|
+ keyword!! in it.label!!
|
|
|
+ } else {
|
|
|
+ false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else -> false
|
|
|
+ }
|
|
|
+ }.toMutableList()
|
|
|
+ }
|
|
|
+
|
|
|
+ return if (current != null && pageSize != null) {
|
|
|
+ // 分页
|
|
|
+ ResponseEntity.ok(ResponseDto().apply {
|
|
|
+ this.data = LogicPagination.pagination(data, current, pageSize)
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ ResponseEntity.ok(ResponseDto().apply {
|
|
|
+ this.data = data
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("{id}")
|
|
|
+ @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
+ fun getById(@PathVariable id: Long): ResponseEntity<*> {
|
|
|
return ResponseEntity.ok(ResponseDto().apply {
|
|
|
- data = sysParamService.getListCacheable()
|
|
|
+ data = sysParamService.selectById(id)
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- @GetMapping("{key}")
|
|
|
- @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
- fun get(@PathVariable key: String): ResponseEntity<*> {
|
|
|
+ @GetMapping("keys/{key}")
|
|
|
+ @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
+ fun getByKey(@PathVariable key: String): ResponseEntity<*> {
|
|
|
return ResponseEntity.ok(ResponseDto().apply {
|
|
|
data = sysParamService.getListByKey(key)
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- @PutMapping("{key}")
|
|
|
- @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
- fun putDic(@PathVariable key: String, @RequestBody data: SysParam): ResponseEntity<*> {
|
|
|
- return ResponseEntity.ok(ResponseDto().apply {
|
|
|
- this.data = sysParamService.modifySysDic(data)
|
|
|
- })
|
|
|
+ @PutMapping
|
|
|
+ @ZenResponseFilter(type = SysParam::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
|
|
|
+ fun putDic(@RequestBody data: SysParam): ResponseEntity<*> {
|
|
|
+ return if (data.id == null) {
|
|
|
+ // insert
|
|
|
+ sysParamService.insertCacheable(data.apply { id = null })
|
|
|
+ ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
|
|
|
+ } else {
|
|
|
+ // update
|
|
|
+ ResponseEntity.ok(ResponseDto().apply {
|
|
|
+ this.data = sysParamService.modify(data) // 200
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @DeleteMapping("{id}")
|
|
|
+ fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
|
|
|
+ // 物理删除数据
|
|
|
+ sysParamService.physicalDeleteCacheable(id)
|
|
|
+ return ResponseEntity.ok(ResponseDto())
|
|
|
}
|
|
|
}
|
NorthLan