提交 7a59d6b9 编写于 作者: S sunxiwang

fix

上级 9dce53df
...@@ -4,25 +4,37 @@ import java.util.HashMap; ...@@ -4,25 +4,37 @@ import java.util.HashMap;
import com.linkwechat.common.utils.StringUtils; import com.linkwechat.common.utils.StringUtils;
import com.linkwechat.common.constant.HttpStatus; import com.linkwechat.common.constant.HttpStatus;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 操作消息提醒 * 操作消息提醒
* *
* @author ruoyi * @author ruoyi
*/ */
public class AjaxResult<T> extends HashMap<String, Object> @ApiModel
public class AjaxResult<T>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 状态码 */ /** 状态码 */
public static final String CODE_TAG = "code"; public static final String CODE_TAG = "code";
@ApiModelProperty("状态码")
private int code;
/** 返回内容 */ /** 返回内容 */
public static final String MSG_TAG = "msg"; public static final String MSG_TAG = "msg";
@ApiModelProperty("返回内容")
private String msg;
/** 数据对象 */ /** 数据对象 */
public static final String DATA_TAG = "data"; public static final String DATA_TAG = "data";
@ApiModelProperty("数据对象")
private T date;
/** /**
* 初始化一个新创建的 AjaxResult 对象,使其表示一个空消息。 * 初始化一个新创建的 AjaxResult 对象,使其表示一个空消息。
*/ */
...@@ -38,8 +50,8 @@ public class AjaxResult<T> extends HashMap<String, Object> ...@@ -38,8 +50,8 @@ public class AjaxResult<T> extends HashMap<String, Object>
*/ */
public AjaxResult(int code, String msg) public AjaxResult(int code, String msg)
{ {
super.put(CODE_TAG, code); this.code = code;
super.put(MSG_TAG, msg); this.msg = msg;
} }
/** /**
...@@ -51,12 +63,9 @@ public class AjaxResult<T> extends HashMap<String, Object> ...@@ -51,12 +63,9 @@ public class AjaxResult<T> extends HashMap<String, Object>
*/ */
public AjaxResult(int code, String msg, T data) public AjaxResult(int code, String msg, T data)
{ {
super.put(CODE_TAG, code); this.code = code;
super.put(MSG_TAG, msg); this.msg = msg;
if (StringUtils.isNotNull(data)) this.date = data;
{
super.put(DATA_TAG, data);
}
} }
/** /**
...@@ -74,7 +83,7 @@ public class AjaxResult<T> extends HashMap<String, Object> ...@@ -74,7 +83,7 @@ public class AjaxResult<T> extends HashMap<String, Object>
* *
* @return 成功消息 * @return 成功消息
*/ */
public static AjaxResult success(Object data) public static <T> AjaxResult success(T data)
{ {
return AjaxResult.success("操作成功", data); return AjaxResult.success("操作成功", data);
} }
...@@ -97,7 +106,7 @@ public class AjaxResult<T> extends HashMap<String, Object> ...@@ -97,7 +106,7 @@ public class AjaxResult<T> extends HashMap<String, Object>
* @param data 数据对象 * @param data 数据对象
* @return 成功消息 * @return 成功消息
*/ */
public static AjaxResult success(String msg, Object data) public static <T> AjaxResult success(String msg, T data)
{ {
return new AjaxResult(HttpStatus.SUCCESS, msg, data); return new AjaxResult(HttpStatus.SUCCESS, msg, data);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册