From 752e00503f672ddfe2066afb6c235721a3a912b5 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 19 十一月 2024 10:25:55 +0800
Subject: [PATCH] 2024.11.19 各项修正
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 bdd9749..e29bba6 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserinfoController.kt
@@ -3,6 +3,7 @@
import cn.flightfeather.supervision.domain.entity.Userinfo
import cn.flightfeather.supervision.lightshare.service.UserinfoService
import cn.flightfeather.supervision.lightshare.vo.LoginRequestVo
+import cn.flightfeather.supervision.lightshare.vo.UserBaseInfo
import cn.flightfeather.supervision.lightshare.vo.UserSearchCondition
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
@@ -30,6 +31,18 @@
@ApiParam("鐢ㄦ埛淇℃伅") @RequestBody userinfo: Userinfo
) = userinfoService.save(userinfo)
+ @ApiOperation(value = "涓婁紶鐢ㄦ埛淇℃伅(鏇磋缁�)")
+ @PutMapping("/create")
+ fun add2(
+ @ApiParam("鐢ㄦ埛淇℃伅") @RequestBody info: UserBaseInfo
+ ) = userinfoService.save2(info)
+
+ @ApiOperation(value = "閲嶇疆鐢ㄦ埛瀵嗙爜")
+ @PostMapping("/resetPw")
+ fun resetPassword(
+ @ApiParam("鐢ㄦ埛id") @RequestParam userId: String
+ ) = userinfoService.resetPassword(userId)
+
@ApiOperation(value = "鏇存柊鐢ㄦ埛淇℃伅")
@PostMapping("")
fun update(
@@ -51,6 +64,12 @@
@ApiParam("娉ㄥ唽淇℃伅") @RequestBody loginRequestVo: LoginRequestVo
) = userinfoService.register(loginRequestVo)
+ @ApiOperation(value = "娉ㄥ唽")
+ @PostMapping("/register2")
+ fun register2(
+ @ApiParam("娉ㄥ唽淇℃伅") @RequestBody loginRequestVo: LoginRequestVo
+ ) = userinfoService.register2(loginRequestVo)
+
@ApiOperation(value = "鑾峰彇鐢ㄦ埛閫氳褰�")
@GetMapping("/addressBook")
fun getAddressBook(
@@ -65,7 +84,7 @@
) = userinfoService.upLoadAccountPic(userId, files)
@ApiOperation(value = "淇敼瀵嗙爜")
- @PostMapping("/password/change/{userId}")
+ @PostMapping("/password/change")
fun changePassword(
@ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String,
@ApiParam("鏃у瘑鐮�") @RequestParam("oldPassword") oldPassword: String,
@@ -85,8 +104,9 @@
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅")
@GetMapping("/baseInfo")
fun getBaseInfo(
- @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String
- ) = userinfoService.getBaseInfo(userId)
+ @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String,
+ @ApiParam("寰俊鐢ㄦ埛id") @RequestParam(value = "wxUserId", required = false) wxUserId: String?
+ ) = userinfoService.getBaseInfo(userId, wxUserId)
@ApiOperation(value = "鏍规嵁缁欏畾鏉′欢锛屾悳绱㈢敤鎴�")
@GetMapping("/search")
@@ -97,4 +117,11 @@
@ApiParam("椤电爜") @RequestParam(value = "page") page: Int,
@ApiParam("鍗曢〉鏁版嵁閲�") @RequestParam(value = "per_page") perPage: Int,
) = userinfoService.search(district, sceneType, userType, page, perPage)
+
+ @ApiOperation(value = "鑾峰彇鏌愪釜鍖哄幙鏌愪釜鍦烘櫙鐨勮繍钀ュ満鏅粺璁�")
+ @PostMapping("/count")
+ fun getSceneCount(
+ @ApiParam("鐢ㄦ埛id") @RequestParam("userId") userId: String,
+ @ApiParam("鏌ヨ鏉′欢") @RequestBody condition: UserSearchCondition,
+ ) = userinfoService.getSceneCount(userId, condition)
}
\ No newline at end of file
--
Gitblit v1.9.3