From fbaa1a53f5766ee4f10ce39c5cf50c7527ec13c6 Mon Sep 17 00:00:00 2001
From: e <i@mxpio.com>
Date: Fri, 31 Jul 2020 15:47:01 +0800
Subject: [PATCH] 返回结果支持泛型
---
jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------
1 file changed, 137 insertions(+), 110 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java
index 71ea11c..9b85023 100644
--- a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/api/vo/Result.java
@@ -1,111 +1,138 @@
-package org.jeecg.common.api.vo;
-
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.jeecg.common.constant.CommonConstant;
-import lombok.Data;
-
-/**
- * 接口返回数据格式
- * @author scott
- * @email jeecgos@163.com
- * @date 2019年1月19日
- */
-@Data
-@ApiModel(value="接口返回对象", description="接口返回对象")
-public class Result<T> implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 成功标志
- */
- @ApiModelProperty(value = "成功标志")
- private boolean success = true;
-
- /**
- * 返回处理消息
- */
- @ApiModelProperty(value = "返回处理消息")
- private String message = "操作成功！";
-
- /**
- * 返回代码
- */
- @ApiModelProperty(value = "返回代码")
- private Integer code = 0;
-
- /**
- * 返回数据对象 data
- */
- @ApiModelProperty(value = "返回数据对象")
- private T result;
-
- /**
- * 时间戳
- */
- @ApiModelProperty(value = "时间戳")
- private long timestamp = System.currentTimeMillis();
-
- public Result() {
-
- }
-
- public Result<T> success(String message) {
- this.message = message;
- this.code = CommonConstant.SC_OK_200;
- this.success = true;
- return this;
- }
-
-
- public static Result<Object> ok() {
- Result<Object> r = new Result<Object>();
- r.setSuccess(true);
- r.setCode(CommonConstant.SC_OK_200);
- r.setMessage("成功");
- return r;
- }
-
- public static Result<Object> ok(String msg) {
- Result<Object> r = new Result<Object>();
- r.setSuccess(true);
- r.setCode(CommonConstant.SC_OK_200);
- r.setMessage(msg);
- return r;
- }
-
- public static Result<Object> ok(Object data) {
- Result<Object> r = new Result<Object>();
- r.setSuccess(true);
- r.setCode(CommonConstant.SC_OK_200);
- r.setResult(data);
- return r;
- }
-
- public static Result<Object> error(String msg) {
- return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
- }
-
- public static Result<Object> error(int code, String msg) {
- Result<Object> r = new Result<Object>();
- r.setCode(code);
- r.setMessage(msg);
- r.setSuccess(false);
- return r;
- }
-
- public Result<T> error500(String message) {
- this.message = message;
- this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
- this.success = false;
- return this;
- }
- /**
- * 无权限访问返回结果
- */
- public static Result<Object> noauth(String msg) {
- return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
- }
+package org.jeecg.common.api.vo;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.jeecg.common.constant.CommonConstant;
+import lombok.Data;
+
+/**
+ * 接口返回数据格式
+ * @author scott
+ * @email jeecgos@163.com
+ * @date 2019年1月19日
+ */
+@Data
+@ApiModel(value="接口返回对象", description="接口返回对象")
+public class Result<T> implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 成功标志
+ */
+ @ApiModelProperty(value = "成功标志")
+ private boolean success = true;
+
+ /**
+ * 返回处理消息
+ */
+ @ApiModelProperty(value = "返回处理消息")
+ private String message = "操作成功！";
+
+ /**
+ * 返回代码
+ */
+ @ApiModelProperty(value = "返回代码")
+ private Integer code = 0;
+
+ /**
+ * 返回数据对象 data
+ */
+ @ApiModelProperty(value = "返回数据对象")
+ private T result;
+
+ /**
+ * 时间戳
+ */
+ @ApiModelProperty(value = "时间戳")
+ private long timestamp = System.currentTimeMillis();
+
+ public Result() {
+
+ }
+
+ public Result<T> success(String message) {
+ this.message = message;
+ this.code = CommonConstant.SC_OK_200;
+ this.success = true;
+ return this;
+ }
+
+ @Deprecated
+ public static Result<Object> ok() {
+ Result<Object> r = new Result<Object>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setMessage("成功");
+ return r;
+ }
+
+ @Deprecated
+ public static Result<Object> ok(String msg) {
+ Result<Object> r = new Result<Object>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setMessage(msg);
+ return r;
+ }
+
+ @Deprecated
+ public static Result<Object> ok(Object data) {
+ Result<Object> r = new Result<Object>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setResult(data);
+ return r;
+ }
+
+ public static<T> Result<T> OK() {
+ Result<T> r = new Result<T>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setMessage("成功");
+ return r;
+ }
+
+ public static<T> Result<T> OK(T data) {
+ Result<T> r = new Result<T>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setResult(data);
+ return r;
+ }
+
+ public static<T> Result<T> OK(String msg, T data) {
+ Result<T> r = new Result<T>();
+ r.setSuccess(true);
+ r.setCode(CommonConstant.SC_OK_200);
+ r.setMessage(msg);
+ r.setResult(data);
+ return r;
+ }
+
+ public static Result<Object> error(String msg) {
+ return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
+ }
+
+ public static Result<Object> error(int code, String msg) {
+ Result<Object> r = new Result<Object>();
+ r.setCode(code);
+ r.setMessage(msg);
+ r.setSuccess(false);
+ return r;
+ }
+
+ public Result<T> error500(String message) {
+ this.message = message;
+ this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
+ this.success = false;
+ return this;
+ }
+ /**
+ * 无权限访问返回结果
+ */
+ public static Result<Object> noauth(String msg) {
+ return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
+ }
}
\ No newline at end of file
--
libgit2 0.22.2