From 1564af04dacafcc08a9682a4ef1e651120c8cc46 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期三, 12 一月 2022 15:24:06 +0800
Subject: [PATCH] 新增搜索用户接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt | 2 ++
src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt | 2 +-
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt | 12 ++++++++++++
src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt | 2 +-
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt | 11 +++++++++++
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt b/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
index c339a5a..c77e4fc 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
@@ -21,7 +21,7 @@
@Bean
fun runner() = ApplicationRunner {
webSocketServer.start()
-// taskController.run()
+ taskController.run()
}
}
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
index e27c237..b0105f7 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
@@ -206,4 +206,16 @@
return UserBaseInfo(userId, userInfo.realname, baseInfo, companyInfo, specialInfo)
}
+
+ override fun search(district: String?, sceneType: Int?, userType: Int?, page: Int, perPage: Int): BaseResponse<List<Userinfo>> {
+ val result = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
+ createCriteria().apply {
+ district?.let { andEqualTo("extension1", it) }
+ sceneType?.let { andEqualTo("extension2", it) }
+ userType?.let { andEqualTo("usertypeid", it) }
+ }
+ })
+
+ return BaseResponse(true, data = result)
+ }
}
\ No newline at end of file
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
index 09154e0..2b2cb74 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
@@ -32,4 +32,6 @@
fun getBaseInfo(userId: String): UserBaseInfo
+ fun search(district: String?, sceneType: Int?, userType: Int?, page: Int, perPage: Int): BaseResponse<List<Userinfo>>
+
}
\ No newline at end of file
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 d028f4b..b315421 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
@@ -6,6 +6,7 @@
import cn.flightfeather.supervision.lightshare.vo.UserSearchCondition
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
import org.springframework.web.bind.annotation.*
import org.springframework.web.multipart.MultipartFile
import javax.servlet.http.HttpServletResponse
@@ -71,4 +72,14 @@
fun getBaseInfo(
@RequestParam("userId") userId: String
) = userinfoService.getBaseInfo(userId)
+
+ @ApiOperation(value = "鏍规嵁缁欏畾鏉′欢锛屾悳绱㈢敤鎴�")
+ @GetMapping("/search")
+ fun search(
+ @ApiParam("鍖哄幙", example = "寰愭眹鍖�") @RequestParam("district", required = false) district: String,
+ @ApiParam("鍦烘櫙绫诲瀷", example = "1", allowableValues = "0,1,2,3,4,5,6,7") @RequestParam("sceneType", required = false) sceneType: Int,
+ @ApiParam("鐢ㄦ埛绫诲瀷", example = "0", allowableValues = "0,1,2,3") @RequestParam("userType", required = false) userType: Int,
+ @RequestParam(value = "page") page: Int,
+ @RequestParam(value = "per_page") perPage: Int,
+ ) = userinfoService.search(district, sceneType, userType, page, perPage)
}
\ No newline at end of file
diff --git a/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt b/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
index b4531af..87d2e00 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
@@ -20,6 +20,6 @@
@Test
fun go() {
- autoScore.go(2021, 7)
+ autoScore.go(2021, 10)
}
}
\ No newline at end of file
--
Gitblit v1.9.3