From ecd14d6757eb12e66d7668eff509c10875abf855 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 15:03:18 +0800
Subject: [PATCH] Merge pull request #578 from urmyfaith/patch-1
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 75 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index 442832b..d628d57 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -9,10 +9,10 @@
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -24,7 +24,7 @@
import javax.security.sasl.AuthenticationException;
import java.util.List;
-@Api(tags = "鐢ㄦ埛绠＄悊")
+@Tag(name = "鐢ㄦ埛绠＄悊")
@CrossOrigin
@RestController
@RequestMapping("/api/user")
@@ -39,12 +39,10 @@
@Autowired
private IRoleService roleService;
- @ApiOperation("鐧诲綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", dataTypeClass = String.class),
- })
@GetMapping("/login")
+ @Operation(summary = "鐧诲綍")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "password", description = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", required = true)
public WVPResult<LoginUser> login(@RequestParam String username, @RequestParam String password){
LoginUser user = null;
WVPResult<LoginUser> result = new WVPResult<>();
@@ -66,13 +64,11 @@
return result;
}
- @ApiOperation("淇敼瀵嗙爜")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "oldpassword", required = true, value = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
- })
@PostMapping("/changePassword")
+ @Operation(summary = "淇敼瀵嗙爜")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "oldpassword", description = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ @Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
LoginUser userInfo = SecurityUtils.getUserInfo();
@@ -97,13 +93,11 @@
}
- @ApiOperation("娣诲姞鐢ㄦ埛")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
- @ApiImplicitParam(name = "roleId", required = true, value = "瑙掕壊ID", dataTypeClass = String.class),
- })
@PostMapping("/add")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "password", description = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ @Parameter(name = "roleId", description = "瑙掕壊ID", required = true)
public ResponseEntity<WVPResult<Integer>> add(@RequestParam String username,
@RequestParam String password,
@RequestParam Integer roleId){
@@ -146,11 +140,9 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @ApiOperation("鍒犻櫎鐢ㄦ埛")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
- })
- @DeleteMapping("/delete")
+ @DeleteMapping("/鍒犻櫎鐢ㄦ埛")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Parameter(name = "id", description = "鐢ㄦ埛Id", required = true)
public ResponseEntity<WVPResult<String>> delete(@RequestParam Integer id){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
@@ -168,9 +160,8 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @ApiOperation("鏌ヨ鐢ㄦ埛")
- @ApiImplicitParams({})
@GetMapping("/all")
+ @Operation(summary = "鏌ヨ鐢ㄦ埛")
public ResponseEntity<WVPResult<List<User>>> all(){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
List<User> allUsers = userService.getAllUsers();
@@ -188,22 +179,18 @@
* @param count 姣忛〉鏌ヨ鏁伴噺
* @return 鍒嗛〉鐢ㄦ埛鍒楄〃
*/
- @ApiOperation("鍒嗛〉鏌ヨ鐢ㄦ埛")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
- })
@GetMapping("/users")
+ @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+ @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
public PageInfo<User> users(int page, int count) {
return userService.getUsers(page, count);
}
- @ApiOperation("淇敼pushkey")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "pushKey", required = true, value = "鏂扮殑pushKey", dataTypeClass = String.class),
- })
@RequestMapping("/changePushKey")
+ @Operation(summary = "淇敼pushkey")
+ @Parameter(name = "userId", description = "鐢ㄦ埛Id", required = true)
+ @Parameter(name = "pushKey", description = "鏂扮殑pushKey", required = true)
public ResponseEntity<WVPResult<String>> changePushKey(@RequestParam Integer userId,@RequestParam String pushKey) {
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
@@ -221,13 +208,11 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
- @ApiOperation("绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "adminId", required = true, value = "绠＄悊鍛榠d", dataTypeClass = String.class),
- @ApiImplicitParam(name = "userId", required = true, value = "鐢ㄦ埛id", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
- })
@PostMapping("/changePasswordForAdmin")
+ @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
+ @Parameter(name = "adminId", description = "绠＄悊鍛榠d", required = true)
+ @Parameter(name = "userId", description = "鐢ㄦ埛id", required = true)
+ @Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
public String changePasswordForAdmin(@RequestParam int userId, @RequestParam String password) {
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
LoginUser userInfo = SecurityUtils.getUserInfo();
--
Gitblit v1.8.0