From d2727f231319a48019bc3b87439136ab49b97b9b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 08 十一月 2024 09:49:57 +0800
Subject: [PATCH] 1. 2024.11.08 修复部分bug
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
index 4f7e412..19127ca 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
@@ -2,7 +2,10 @@
import cn.flightfeather.supervision.domain.ds1.entity.Userinfo
import cn.flightfeather.supervision.lightshare.service.UserinfoService
+import cn.flightfeather.supervision.lightshare.vo.AreaVo
import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
import org.springframework.web.bind.annotation.*
@Api(tags = ["UserinfoController"], description = "鐢ㄦ埛淇℃伅API鎺ュ彛")
@@ -16,8 +19,12 @@
@GetMapping("/{id}")
fun getById(@PathVariable id: String) = userinfoService.findOne(id)
+ @ApiOperation(value = "鎸夌敤鎴风被鍨嬫悳绱㈢敤鎴蜂俊鎭�")
@GetMapping("/type/get")
- fun getUserByTypeId(@RequestParam typeId: Byte) = userinfoService.findByType(typeId)
+ fun getUserByTypeId(
+ @ApiParam("鐢ㄦ埛绫诲瀷id") @RequestParam typeId: Byte,
+ @ApiParam("鐢ㄦ埛鏄惁鍙敤", required = false, defaultValue = "true") @RequestParam(required = false) enable: Boolean?
+ ) = userinfoService.findByType(typeId, enable)
@PutMapping("")
fun add(@RequestBody userinfo: Userinfo) = userinfoService.save(userinfo)
@@ -28,6 +35,22 @@
@DeleteMapping("/{id}")
fun delete(@PathVariable id: String) = userinfoService.delete(id)
+ @ApiOperation(value = "妯＄硦鎼滅储鐢ㄦ埛淇℃伅")
+ @PostMapping("/search")
+ fun search(
+ @ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody
+ areaVo: AreaVo,
+ @ApiParam("鎼滅储鍏抽敭瀛楋紝鍖归厤鐢ㄦ埛璐︽埛鍚嶅拰鏄电О") @RequestParam
+ keyword: String,
+ @ApiParam("鐢ㄦ埛绫诲瀷", example = "0:绠＄悊鍛�;1:鍐呴儴浜哄憳;2:鏀垮簻閮ㄩ棬;3:浼佷笟", defaultValue = "3", required = false)
+ @RequestParam(required = false)
+ userType: Int?,
+ @ApiParam("鏌ヨ椤电爜", defaultValue = "1", required = false) @RequestParam("page", required = false)
+ page: Int?,
+ @ApiParam("鍗曢〉鏁版嵁閲�", defaultValue = "30", required = false) @RequestParam("per_page", required = false)
+ perPage: Int?,
+ ) = resPack { userinfoService.search(areaVo, keyword, userType, page, perPage) }
+
@PostMapping("/login")
fun getByName(@RequestBody userinfo: Userinfo) = userinfoService.findOneByName(userinfo)
--
Gitblit v1.9.3