From 8a0a8adfbe53db564df7aaaf561a60be7d4d8dd0 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 26 九月 2024 17:52:24 +0800
Subject: [PATCH] 1. 新增监管系统中用户模糊搜索功能 2. 新增监测设备和用户的匹配关系搜索功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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..c9ad232 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鎺ュ彛")
@@ -28,6 +31,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