From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/tool/swagger/TestController.java | 89 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
index 17f4c31..0859437 100644
--- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
+++ b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -9,23 +9,24 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
/**
* swagger 鐢ㄦ埛娴嬭瘯鏂规硶
*
* @author ruoyi
*/
-@Api("鐢ㄦ埛淇℃伅绠＄悊")
+@Tag(name = "鐢ㄦ埛淇℃伅绠＄悊")
@RestController
@RequestMapping("/test/user")
public class TestController extends BaseController
@@ -36,88 +37,94 @@
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
}
- @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
+ @Operation(summary = "鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/list")
- public AjaxResult userList()
+ public R<List<UserEntity>> userList()
{
List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
- return AjaxResult.success(userList);
+ return R.ok(userList);
}
- @ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path")
- @GetMapping("/{userId}")
- public AjaxResult getUser(@PathVariable Integer userId)
+ @Operation(summary = "鑾峰彇鐢ㄦ埛璇︾粏")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @GetMapping("/{userId}")
+ public R<UserEntity> getUser(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
- return AjaxResult.success(users.get(userId));
+ return R.ok(users.get(userId));
}
else
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
}
- @ApiOperation("鏂板鐢ㄦ埛")
- @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity")
- @PostMapping("/save")
- public AjaxResult save(UserEntity user)
+ @Operation(summary = "鏂板鐢ㄦ埛")
+ @Parameters({
+ @Parameter(name = "userId", description = "鐢ㄦ埛id"),
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚嶇О"),
+ @Parameter(name = "password", description = "鐢ㄦ埛瀵嗙爜"),
+ @Parameter(name = "mobile", description = "鐢ㄦ埛鎵嬫満")
+ })
+ @PostMapping("/save")
+ public R<String> save(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return R.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
- return AjaxResult.success(users.put(user.getUserId(), user));
+ users.put(user.getUserId(), user);
+ return R.ok();
}
- @ApiOperation("鏇存柊鐢ㄦ埛")
- @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity")
+ @Operation(summary = "鏇存柊鐢ㄦ埛")
@PutMapping("/update")
- public AjaxResult update(UserEntity user)
+ public R<String> update(@RequestBody UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return R.fail("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
if (users.isEmpty() || !users.containsKey(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
users.remove(user.getUserId());
- return AjaxResult.success(users.put(user.getUserId(), user));
+ users.put(user.getUserId(), user);
+ return R.ok();
}
- @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path")
- @DeleteMapping("/{userId}")
- public AjaxResult delete(@PathVariable Integer userId)
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛淇℃伅")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @DeleteMapping("/{userId}")
+ public R<String> delete(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
users.remove(userId);
- return AjaxResult.success();
+ return R.ok();
}
else
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
}
}
-@ApiModel("鐢ㄦ埛瀹炰綋")
+@Schema(name = "UserEntity", description = "鐢ㄦ埛瀹炰綋")
class UserEntity
{
- @ApiModelProperty("鐢ㄦ埛ID")
+ @Schema(description = "鐢ㄦ埛ID")
private Integer userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
+ @Schema(description = "鐢ㄦ埛鍚嶇О")
private String username;
- @ApiModelProperty("鐢ㄦ埛瀵嗙爜")
+ @Schema(description = "鐢ㄦ埛瀵嗙爜")
private String password;
- @ApiModelProperty("鐢ㄦ埛鎵嬫満")
+ @Schema(description = "鐢ㄦ埛鎵嬫満")
private String mobile;
public UserEntity()
--
Gitblit v1.9.3