From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
index f4e88db..951d83d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java
@@ -4,28 +4,24 @@
import java.util.Objects;
import com.ruoyi.common.core.constant.HttpStatus;
import com.ruoyi.common.core.utils.StringUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
/**
* 操作消息提醒
*
* @author ruoyi
*/
-@ApiModel
-public class AjaxResult<T> extends HashMap {
+public class AjaxResult<T> extends HashMap<String, Object>
+{
+ private static final long serialVersionUID = 1L;
/** 状态码 */
- @ApiModelProperty("状态码")
- private int code;
+ public static final String CODE_TAG = "code";
/** 返回内容 */
- @ApiModelProperty("描述内容")
- private String msg = "";
+ public static final String MSG_TAG = "msg";
/** 数据对象 */
- @ApiModelProperty("结果集")
- private T data;
+ public static final String DATA_TAG = "data";
/**
* 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
@@ -42,8 +38,8 @@
*/
public AjaxResult(int code, String msg)
{
- this.code = code;
- this.msg = msg;
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
}
/**
@@ -53,12 +49,12 @@
* @param msg 返回内容
* @param data 数据对象
*/
- public AjaxResult(int code, String msg, T data)
+ public AjaxResult(int code, String msg, Object data)
{
- this.code = code;
- this.msg = msg;
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
if (StringUtils.isNotNull(data)) {
- this.data = data;
+ super.put(DATA_TAG, data);
}
}
@@ -185,7 +181,7 @@
*/
public boolean isSuccess()
{
- return Objects.equals(HttpStatus.SUCCESS, this.code);
+ return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
}
/**
@@ -199,4 +195,19 @@
}
+
+
+ /**
+ * 方便链式调用
+ *
+ * @param key
+ * @param value
+ * @return
+ */
+ @Override
+ public AjaxResult put(String key, Object value)
+ {
+ super.put(key, value);
+ return this;
+ }
}
--
Gitblit v1.7.1