From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 14 四月 2021 13:22:31 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java | 341 +++++++++++++++++++++++++++----------------------------- 1 files changed, 166 insertions(+), 175 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java index 2ae0c54..3c5bf7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java @@ -1,175 +1,166 @@ -package com.ruoyi.web.controller.tool; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -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; - -/** - * swagger 鐢ㄦ埛娴嬭瘯鏂规硶 - * - * @author ruoyi - */ -@Api("鐢ㄦ埛淇℃伅绠$悊") -@RestController -@RequestMapping("/test/user") -public class TestController extends BaseController -{ - private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>(); - { - users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); - users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); - } - - @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃") - @GetMapping("/list") - public AjaxResult userList() - { - List<UserEntity> userList = new ArrayList<UserEntity>(users.values()); - return AjaxResult.success(userList); - } - - @ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏") - @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path") - @GetMapping("/{userId}") - public AjaxResult getUser(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { - return AjaxResult.success(users.get(userId)); - } - else - { - return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); - } - } - - @ApiOperation("鏂板鐢ㄦ埛") - @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity") - @PostMapping("/save") - public AjaxResult save(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { - return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - return AjaxResult.success(users.put(user.getUserId(), user)); - } - - @ApiOperation("鏇存柊鐢ㄦ埛") - @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity") - @PutMapping("/update") - public AjaxResult update(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { - return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖"); - } - if (users.isEmpty() || !users.containsKey(user.getUserId())) - { - return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); - } - users.remove(user.getUserId()); - return AjaxResult.success(users.put(user.getUserId(), user)); - } - - @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅") - @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path") - @DeleteMapping("/{userId}") - public AjaxResult delete(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { - users.remove(userId); - return AjaxResult.success(); - } - else - { - return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); - } - } -} - -@ApiModel("鐢ㄦ埛瀹炰綋") -class UserEntity -{ - @ApiModelProperty("鐢ㄦ埛ID") - private Integer userId; - - @ApiModelProperty("鐢ㄦ埛鍚嶇О") - private String username; - - @ApiModelProperty("鐢ㄦ埛瀵嗙爜") - private String password; - - @ApiModelProperty("鐢ㄦ埛鎵嬫満") - private String mobile; - - public UserEntity() - { - - } - - public UserEntity(Integer userId, String username, String password, String mobile) - { - this.userId = userId; - this.username = username; - this.password = password; - this.mobile = mobile; - } - - public Integer getUserId() - { - return userId; - } - - public void setUserId(Integer userId) - { - this.userId = userId; - } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getMobile() - { - return mobile; - } - - public void setMobile(String mobile) - { - this.mobile = mobile; - } -} +package com.ruoyi.web.controller.tool; + +import cn.hutool.core.lang.Validator; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * swagger 鐢ㄦ埛娴嬭瘯鏂规硶 + * + * @author ruoyi + */ +@Api("鐢ㄦ埛淇℃伅绠$悊") +@RestController +@RequestMapping("/test/user") +public class TestController extends BaseController +{ + private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>(); + { + users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); + users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); + } + + @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃") + @GetMapping("/list") + public AjaxResult userList() + { + List<UserEntity> userList = new ArrayList<UserEntity>(users.values()); + return AjaxResult.success(userList); + } + + @ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏") + @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path") + @GetMapping("/{userId}") + public AjaxResult getUser(@PathVariable Integer userId) + { + if (!users.isEmpty() && users.containsKey(userId)) + { + return AjaxResult.success(users.get(userId)); + } + else + { + return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); + } + } + + @ApiOperation("鏂板鐢ㄦ埛") + @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity") + @PostMapping("/save") + public AjaxResult save(UserEntity user) + { + if (Validator.isNull(user) || Validator.isNull(user.getUserId())) + { + return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖"); + } + return AjaxResult.success(users.put(user.getUserId(), user)); + } + + @ApiOperation("鏇存柊鐢ㄦ埛") + @ApiImplicitParam(name = "userEntity", value = "鏂板鐢ㄦ埛淇℃伅", dataType = "UserEntity") + @PutMapping("/update") + public AjaxResult update(UserEntity user) + { + if (Validator.isNull(user) || Validator.isNull(user.getUserId())) + { + return AjaxResult.error("鐢ㄦ埛ID涓嶈兘涓虹┖"); + } + if (users.isEmpty() || !users.containsKey(user.getUserId())) + { + return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); + } + users.remove(user.getUserId()); + return AjaxResult.success(users.put(user.getUserId(), user)); + } + + @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅") + @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path") + @DeleteMapping("/{userId}") + public AjaxResult delete(@PathVariable Integer userId) + { + if (!users.isEmpty() && users.containsKey(userId)) + { + users.remove(userId); + return AjaxResult.success(); + } + else + { + return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�"); + } + } +} + +@ApiModel("鐢ㄦ埛瀹炰綋") +class UserEntity +{ + @ApiModelProperty("鐢ㄦ埛ID") + private Integer userId; + + @ApiModelProperty("鐢ㄦ埛鍚嶇О") + private String username; + + @ApiModelProperty("鐢ㄦ埛瀵嗙爜") + private String password; + + @ApiModelProperty("鐢ㄦ埛鎵嬫満") + private String mobile; + + public UserEntity() + { + + } + + public UserEntity(Integer userId, String username, String password, String mobile) + { + this.userId = userId; + this.username = username; + this.password = password; + this.mobile = mobile; + } + + public Integer getUserId() + { + return userId; + } + + public void setUserId(Integer userId) + { + this.userId = userId; + } + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getMobile() + { + return mobile; + } + + public void setMobile(String mobile) + { + this.mobile = mobile; + } +} -- Gitblit v1.9.3