From 6c32fddc7b967fccec19ce7ffbb4a46db4123a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=A6=E6=98=AF=E5=90=97?= <1733179386@qq.com> Date: Mon, 19 Jul 2021 11:12:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E5=9C=A8common=E5=8C=85?= =?UTF-8?q?=E5=86=85=E7=BC=96=E5=86=99=E4=BA=86Swagger-module=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E5=B0=86swagger=E4=BE=9D=E8=B5=96=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0common=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 12 ------------ ruoyi-common/pom.xml | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 74855f53e..815851337 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -30,18 +30,6 @@ true - - - io.springfox - springfox-boot-starter - - - - - io.swagger - swagger-models - 1.6.2 - diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index edd31141d..acf7fdb38 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -101,6 +101,19 @@ javax.servlet-api + + + io.springfox + springfox-boot-starter + + + + + io.swagger + swagger-models + 1.6.2 + + \ No newline at end of file From f5553e2bca7f1f432cfcae018d3fac93bbc3d7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=A6=E6=98=AF=E5=90=97?= <1733179386@qq.com> Date: Mon, 19 Jul 2021 11:12:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E7=9A=84=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9TestController=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/tool/TestController.java | 33 +++-- .../ruoyi/common/core/domain/XaResult.java | 129 ++++++++++++++++++ 2 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/XaResult.java 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 4588a7a53..613aa8e7c 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 @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + +import com.ruoyi.common.core.domain.XaResult; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -33,6 +35,7 @@ import io.swagger.annotations.ApiOperation; public class TestController extends BaseController { private final static Map users = new LinkedHashMap(); + { users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); @@ -40,24 +43,24 @@ public class TestController extends BaseController @ApiOperation("获取用户列表") @GetMapping("/list") - public AjaxResult userList() + public XaResult> userList() { List userList = new ArrayList(users.values()); - return AjaxResult.success(userList); + return XaResult.success(userList); } @ApiOperation("获取用户详细") @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path") @GetMapping("/{userId}") - public AjaxResult getUser(@PathVariable Integer userId) + public XaResult getUser(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { - return AjaxResult.success(users.get(userId)); + return XaResult.success(users.get(userId)); } else { - return error("用户不存在"); + return XaResult.error("用户不存在"); } } @@ -69,44 +72,44 @@ public class TestController extends BaseController @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String") }) @PostMapping("/save") - public AjaxResult save(UserEntity user) + public XaResult save(UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { - return error("用户ID不能为空"); + return XaResult.error("用户ID不能为空"); } - return AjaxResult.success(users.put(user.getUserId(), user)); + return XaResult.success(users.put(user.getUserId(), user)); } @ApiOperation("更新用户") @PutMapping("/update") - public AjaxResult update(@RequestBody UserEntity user) + public XaResult update(@RequestBody UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { - return error("用户ID不能为空"); + return XaResult.error("用户ID不能为空"); } if (users.isEmpty() || !users.containsKey(user.getUserId())) { - return error("用户不存在"); + return XaResult.error("用户不存在"); } users.remove(user.getUserId()); - return AjaxResult.success(users.put(user.getUserId(), user)); + return XaResult.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) + public XaResult delete(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { users.remove(userId); - return success(); + return XaResult.success(); } else { - return error("用户不存在"); + return XaResult.error("用户不存在"); } } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/XaResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/XaResult.java new file mode 100644 index 000000000..a59a2fdac --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/XaResult.java @@ -0,0 +1,129 @@ +package com.ruoyi.common.core.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; + +/** + * @author eason.zt + * @version V1.0 + * @Title: XaResult.java + * @Package com.web.hhrz.base.kuadi100 + * @Description: Service返回结果统一对象 + * @date 2014年8月13日 下午7:46:23 + * @update 2021年7月19号 + * @updateBy 哦是吗 + */ +@ApiModel +@SuppressWarnings("unchecked") +public class XaResult { + + @ApiModelProperty(value = "code : 返回代码，0表示OK，其它的都有对应问题",position = 1) + private int code = 0; + + @ApiModelProperty(value = "msg : 如果code!=0,错误信息",position = 2) + private String msg; + + @ApiModelProperty(value = "如果code!=0,message的补充信息",position = 3) + private Object exception; + + @ApiModelProperty(value = "code为0时返回结果集",position = 4) + private T data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Object getException() { + return exception; + } + + public void setException(Object exception) { + this.exception = exception; + } + + public T getData() { + return data; + } + + + public XaResult setData(T data) { + this.data = data; + return this; + } + + public XaResult(String errorMsg) { + this.msg = errorMsg; + this.code = 500; + this.data = (T) new Object(); + } + + public XaResult(String errorMsg, int code) { + this.msg = errorMsg; + this.code = code; + this.data = (T) new Object(); + } + + public XaResult(T data) { + this.data = data; + } + + public XaResult() { + this.data = (T) new Object(); + } + + public static XaResult success(T object) { + XaResult xaResult = new XaResult<>(); + xaResult.setCode(0); + xaResult.setMsg("success"); + xaResult.setData(object); + return xaResult; + } + + public static XaResult success() { + XaResult xaResult = new XaResult<>(); + xaResult.setCode(0); + xaResult.setMsg("success"); + xaResult.setData(null); + return xaResult; + } + + public static XaResult error(String msg, T object) { + XaResult xaResult = new XaResult<>(); + xaResult.setCode(500); + xaResult.setMsg(msg); + xaResult.setData(object); + return xaResult; + } + + + public static XaResult error(String msg) { + XaResult xaResult = new XaResult<>(); + xaResult.setCode(500); + xaResult.setMsg(msg); + xaResult.setData(null); + return xaResult; + } + + + public static XaResult error() { + XaResult xaResult = new XaResult<>(); + xaResult.setCode(500); + xaResult.setMsg("未知异常，请联系管理员"); + xaResult.setData(null); + return xaResult; + } +} \ No newline at end of file