| 
															
																@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import org.springframework.web.bind.annotation.RequestMapping;
 
															 | 
															
															 | 
															
																 import org.springframework.web.bind.annotation.RequestMapping;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import org.springframework.web.bind.annotation.RestController;
 
															 | 
															
															 | 
															
																 import org.springframework.web.bind.annotation.RestController;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import com.ruoyi.common.core.controller.BaseController;
 
															 | 
															
															 | 
															
																 import com.ruoyi.common.core.controller.BaseController;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-import com.ruoyi.common.core.domain.AjaxResult;
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+import com.ruoyi.common.core.domain.R;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import com.ruoyi.common.utils.StringUtils;
 
															 | 
															
															 | 
															
																 import com.ruoyi.common.utils.StringUtils;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import io.swagger.annotations.Api;
 
															 | 
															
															 | 
															
																 import io.swagger.annotations.Api;
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 import io.swagger.annotations.ApiImplicitParam;
 
															 | 
															
															 | 
															
																 import io.swagger.annotations.ApiImplicitParam;
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -40,24 +40,24 @@ public class TestController extends BaseController 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiOperation("获取用户列表")
 
															 | 
															
															 | 
															
																     @ApiOperation("获取用户列表")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @GetMapping("/list")
 
															 | 
															
															 | 
															
																     @GetMapping("/list")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult userList()
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public R<List<UserEntity>> userList()
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
 
															 | 
															
															 | 
															
																         List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-        return AjaxResult.success(userList);
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        return R.ok(userList);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiOperation("获取用户详细")
 
															 | 
															
															 | 
															
																     @ApiOperation("获取用户详细")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
 
															 | 
															
															 | 
															
																     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @GetMapping("/{userId}")
 
															 | 
															
															 | 
															
																     @GetMapping("/{userId}")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult getUser(@PathVariable Integer userId)
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public R<UserEntity> getUser(@PathVariable Integer userId)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         if (!users.isEmpty() && users.containsKey(userId))
 
															 | 
															
															 | 
															
																         if (!users.isEmpty() && users.containsKey(userId))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return AjaxResult.success(users.get(userId));
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.ok(users.get(userId));
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         else
 
															 | 
															
															 | 
															
																         else
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return error("用户不存在");
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.fail("用户不存在");
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -69,44 +69,46 @@ public class TestController extends BaseController 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
 
															 | 
															
															 | 
															
																         @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     })
 
															 | 
															
															 | 
															
																     })
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @PostMapping("/save")
 
															 | 
															
															 | 
															
																     @PostMapping("/save")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult save(UserEntity user)
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public R<String> save(UserEntity user)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
 
															 | 
															
															 | 
															
																         if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return error("用户ID不能为空");
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.fail("用户ID不能为空");
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-        return AjaxResult.success(users.put(user.getUserId(), user));
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        users.put(user.getUserId(), user);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        return R.ok();
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiOperation("更新用户")
 
															 | 
															
															 | 
															
																     @ApiOperation("更新用户")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @PutMapping("/update")
 
															 | 
															
															 | 
															
																     @PutMapping("/update")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult update(@RequestBody UserEntity user)
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public R<String> update(@RequestBody UserEntity user)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
 
															 | 
															
															 | 
															
																         if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return error("用户ID不能为空");
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.fail("用户ID不能为空");
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         if (users.isEmpty() || !users.containsKey(user.getUserId()))
 
															 | 
															
															 | 
															
																         if (users.isEmpty() || !users.containsKey(user.getUserId()))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return error("用户不存在");
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.fail("用户不存在");
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         users.remove(user.getUserId());
 
															 | 
															
															 | 
															
																         users.remove(user.getUserId());
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-        return AjaxResult.success(users.put(user.getUserId(), user));
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        users.put(user.getUserId(), user);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        return R.ok();
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiOperation("删除用户信息")
 
															 | 
															
															 | 
															
																     @ApiOperation("删除用户信息")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
 
															 | 
															
															 | 
															
																     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @DeleteMapping("/{userId}")
 
															 | 
															
															 | 
															
																     @DeleteMapping("/{userId}")
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult delete(@PathVariable Integer userId)
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public R<String> delete(@PathVariable Integer userId)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         if (!users.isEmpty() && users.containsKey(userId))
 
															 | 
															
															 | 
															
																         if (!users.isEmpty() && users.containsKey(userId))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             users.remove(userId);
 
															 | 
															
															 | 
															
																             users.remove(userId);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return success();
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.ok();
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         else
 
															 | 
															
															 | 
															
																         else
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         {
 
															 | 
															
															 | 
															
																         {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return error("用户不存在");
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return R.fail("用户不存在");
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 }
 
															 | 
															
															 | 
															
																 }
 
															 |