From dbc4616dc648d25b3a1e3792f2e53b125ccfdc00 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 20 九月 2021 18:56:43 +0800
Subject: [PATCH] reset dataSourceAspect
---
src/main/java/com/ruoyi/project/tool/swagger/TestController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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..c934fc4 100644
--- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
+++ b/src/main/java/com/ruoyi/project/tool/swagger/TestController.java
@@ -9,6 +9,7 @@
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;
@@ -16,6 +17,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
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;
@@ -55,34 +57,38 @@
}
else
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return error("鐢ㄦ埛涓嶅瓨鍦�");
}
}
@ApiOperation("鏂板鐢ㄦ埛")
- @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛id", dataType = "Integer"),
+ @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚嶇О", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "鐢ㄦ埛瀵嗙爜", dataType = "String"),
+ @ApiImplicitParam(name = "mobile", value = "鐢ㄦ埛鎵嬫満", dataType = "String")
+ })
@PostMapping("/save")
public AjaxResult save(UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return error("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
return AjaxResult.success(users.put(user.getUserId(), user));
}
@ApiOperation("鏇存柊鐢ㄦ埛")
- @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity")
@PutMapping("/update")
- public AjaxResult update(UserEntity user)
+ public AjaxResult update(@RequestBody UserEntity user)
{
if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ return error("鐢ㄦ埛ID涓嶈兘涓虹┖");
}
if (users.isEmpty() || !users.containsKey(user.getUserId()))
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return error("鐢ㄦ埛涓嶅瓨鍦�");
}
users.remove(user.getUserId());
return AjaxResult.success(users.put(user.getUserId(), user));
@@ -96,16 +102,16 @@
if (!users.isEmpty() && users.containsKey(userId))
{
users.remove(userId);
- return AjaxResult.success();
+ return success();
}
else
{
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return error("鐢ㄦ埛涓嶅瓨鍦�");
}
}
}
-@ApiModel("鐢ㄦ埛瀹炰綋")
+@ApiModel(value = "UserEntity", description = "鐢ㄦ埛瀹炰綋")
class UserEntity
{
@ApiModelProperty("鐢ㄦ埛ID")
--
Gitblit v1.9.3