From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/project/tool/swagger/TestController.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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 0859437..52e324d 100644
--- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
+++ b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -12,14 +12,16 @@
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.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;
+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.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 鐢ㄦ埛娴嬭瘯鏂规硶
@@ -46,9 +48,9 @@
}
@Operation(summary = "鑾峰彇鐢ㄦ埛璇︾粏")
- @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
- @GetMapping("/{userId}")
- public R<UserEntity> getUser(@PathVariable Integer userId)
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @GetMapping("/{userId}")
+ public R<UserEntity> getUser(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
@@ -60,15 +62,16 @@
}
}
+ @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)
+ @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()))
{
@@ -78,6 +81,7 @@
return R.ok();
}
+ @Log(title = "娴嬭瘯鎺ュ彛鏇存柊鐢ㄦ埛", businessType = BusinessType.UPDATE)
@Operation(summary = "鏇存柊鐢ㄦ埛")
@PutMapping("/update")
public R<String> update(@RequestBody UserEntity user)
@@ -95,10 +99,11 @@
return R.ok();
}
+ @Log(title = "娴嬭瘯鎺ュ彛鍒犻櫎鐢ㄦ埛", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎鐢ㄦ埛淇℃伅")
- @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
- @DeleteMapping("/{userId}")
- public R<String> delete(@PathVariable Integer userId)
+ @Parameter(name = "userId", description = "鐢ㄦ埛ID", required = true)
+ @DeleteMapping("/{userId}")
+ public R<String> delete(@PathVariable Integer userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
--
Gitblit v1.9.3