From 3706d2e1db45e64a1375b92300901de39e35e464 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 25 一月 2022 21:50:54 +0800
Subject: [PATCH] update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java | 128 ++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 72 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 28e5a68..333af88 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -1,148 +1,132 @@
package com.ruoyi.common.core.domain;
-import java.util.HashMap;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
+import cn.hutool.http.HttpStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* 鎿嶄綔娑堟伅鎻愰啋
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class AjaxResult extends HashMap<String, Object>
-{
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("璇锋眰鍝嶅簲瀵硅薄")
+public class AjaxResult<T> {
+
private static final long serialVersionUID = 1L;
- /** 鐘舵�佺爜 */
- public static final String CODE_TAG = "code";
-
- /** 杩斿洖鍐呭 */
- public static final String MSG_TAG = "msg";
-
- /** 鏁版嵁瀵硅薄 */
- public static final String DATA_TAG = "data";
+ /**
+ * 鐘舵�佺爜
+ */
+ @ApiModelProperty("娑堟伅鐘舵�佺爜")
+ private int code;
/**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆�
+ * 杩斿洖鍐呭
*/
- public AjaxResult()
- {
- }
+ @ApiModelProperty("娑堟伅鍐呭")
+ private String msg;
+
+ /**
+ * 鏁版嵁瀵硅薄
+ */
+ @ApiModelProperty("鏁版嵁瀵硅薄")
+ private T data;
/**
* 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
+ *
* @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
+ * @param msg 杩斿洖鍐呭
*/
- public AjaxResult(int code, String msg)
- {
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
- }
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
- * @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- */
- public AjaxResult(int code, String msg, Object data)
- {
- super.put(CODE_TAG, code);
- super.put(MSG_TAG, msg);
- if (StringUtils.isNotNull(data))
- {
- super.put(DATA_TAG, data);
- }
+ public AjaxResult(int code, String msg) {
+ this.code = code;
+ this.msg = msg;
}
/**
* 杩斿洖鎴愬姛娑堟伅
- *
+ *
* @return 鎴愬姛娑堟伅
*/
- public static AjaxResult success()
- {
+ public static AjaxResult<Void> success() {
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
* 杩斿洖鎴愬姛鏁版嵁
- *
+ *
* @return 鎴愬姛娑堟伅
*/
- public static AjaxResult success(Object data)
- {
+ public static <T> AjaxResult<T> success(T data) {
return AjaxResult.success("鎿嶄綔鎴愬姛", data);
}
/**
* 杩斿洖鎴愬姛娑堟伅
- *
+ *
* @param msg 杩斿洖鍐呭
* @return 鎴愬姛娑堟伅
*/
- public static AjaxResult success(String msg)
- {
+ public static AjaxResult<Void> success(String msg) {
return AjaxResult.success(msg, null);
}
/**
* 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
+ *
+ * @param msg 杩斿洖鍐呭
* @param data 鏁版嵁瀵硅薄
* @return 鎴愬姛娑堟伅
*/
- public static AjaxResult success(String msg, Object data)
- {
- return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+ public static <T> AjaxResult<T> success(String msg, T data) {
+ return new AjaxResult<>(HttpStatus.HTTP_OK, msg, data);
}
/**
* 杩斿洖閿欒娑堟伅
- *
+ *
* @return
*/
- public static AjaxResult error()
- {
+ public static AjaxResult<Void> error() {
return AjaxResult.error("鎿嶄綔澶辫触");
}
/**
* 杩斿洖閿欒娑堟伅
- *
+ *
* @param msg 杩斿洖鍐呭
* @return 璀﹀憡娑堟伅
*/
- public static AjaxResult error(String msg)
- {
+ public static AjaxResult<Void> error(String msg) {
return AjaxResult.error(msg, null);
}
/**
* 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
+ *
+ * @param msg 杩斿洖鍐呭
* @param data 鏁版嵁瀵硅薄
* @return 璀﹀憡娑堟伅
*/
- public static AjaxResult error(String msg, Object data)
- {
- return new AjaxResult(HttpStatus.ERROR, msg, data);
+ public static <T> AjaxResult<T> error(String msg, T data) {
+ return new AjaxResult<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
}
/**
* 杩斿洖閿欒娑堟伅
- *
+ *
* @param code 鐘舵�佺爜
- * @param msg 杩斿洖鍐呭
+ * @param msg 杩斿洖鍐呭
* @return 璀﹀憡娑堟伅
*/
- public static AjaxResult error(int code, String msg)
- {
- return new AjaxResult(code, msg, null);
+ public static AjaxResult<Void> error(int code, String msg) {
+ return new AjaxResult<>(code, msg, null);
}
+
}
--
Gitblit v1.9.3