From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/project/tool/swagger/TestController.java | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 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 21871ce..52e324d 100644
--- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
+++ b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -13,21 +13,22 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-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.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
@@ -38,7 +39,7 @@
users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
}
- @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
+ @Operation(summary = "鑾峰彇鐢ㄦ埛鍒楄〃")
@GetMapping("/list")
public R<List<UserEntity>> userList()
{
@@ -46,8 +47,8 @@
return R.ok(userList);
}
- @ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+ @Operation(summary = "鑾峰彇鐢ㄦ埛璇︾粏")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
@GetMapping("/{userId}")
public R<UserEntity> getUser(@PathVariable Integer userId)
{
@@ -61,12 +62,13 @@
}
}
- @ApiOperation("鏂板鐢ㄦ埛")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛id", dataType = "Integer", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚嶇О", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "鐢ㄦ埛瀵嗙爜", dataType = "String", dataTypeClass = String.class),
- @ApiImplicitParam(name = "mobile", value = "鐢ㄦ埛鎵嬫満", dataType = "String", dataTypeClass = String.class)
+ @Log(title = "娴嬭瘯鎺ュ彛鏂板鐢ㄦ埛", businessType = BusinessType.INSERT)
+ @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)
@@ -79,7 +81,8 @@
return R.ok();
}
- @ApiOperation("鏇存柊鐢ㄦ埛")
+ @Log(title = "娴嬭瘯鎺ュ彛鏇存柊鐢ㄦ埛", businessType = BusinessType.UPDATE)
+ @Operation(summary = "鏇存柊鐢ㄦ埛")
@PutMapping("/update")
public R<String> update(@RequestBody UserEntity user)
{
@@ -96,8 +99,9 @@
return R.ok();
}
- @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+ @Log(title = "娴嬭瘯鎺ュ彛鍒犻櫎鐢ㄦ埛", businessType = BusinessType.DELETE)
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛淇℃伅")
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
@DeleteMapping("/{userId}")
public R<String> delete(@PathVariable Integer userId)
{
@@ -113,19 +117,19 @@
}
}
-@ApiModel(value = "UserEntity", description = "鐢ㄦ埛瀹炰綋")
+@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