From 8af85e80663836a2f893be7c6feaefdf92bc93a6 Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 19 九月 2022 20:30:46 +0800
Subject: [PATCH] !234 【轻量级 PR】使用 `@SaIgnore` 替换 `@Anonymous ` Merge pull request !234 from MichelleChung/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
index 8fa4a64..12dc16c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -1,7 +1,5 @@
package com.ruoyi.common.core.domain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -14,7 +12,6 @@
*/
@Data
@NoArgsConstructor
-@ApiModel("璇锋眰鍝嶅簲瀵硅薄")
public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,33 +25,30 @@
*/
public static final int FAIL = 500;
- @ApiModelProperty("娑堟伅鐘舵�佺爜")
private int code;
- @ApiModelProperty("娑堟伅鍐呭")
private String msg;
- @ApiModelProperty("鏁版嵁瀵硅薄")
private T data;
public static <T> R<T> ok() {
- return restResult(null, SUCCESS, null);
+ return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(T data) {
- return restResult(data, SUCCESS, null);
+ return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(String msg) {
return restResult(null, SUCCESS, msg);
}
- public static <T> R<T> ok(T data, String msg) {
+ public static <T> R<T> ok(String msg, T data) {
return restResult(data, SUCCESS, msg);
}
public static <T> R<T> fail() {
- return restResult(null, FAIL, null);
+ return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg) {
@@ -62,10 +56,10 @@
}
public static <T> R<T> fail(T data) {
- return restResult(data, FAIL, null);
+ return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
- public static <T> R<T> fail(T data, String msg) {
+ public static <T> R<T> fail(String msg, T data) {
return restResult(data, FAIL, msg);
}
@@ -81,4 +75,11 @@
return r;
}
+ public Boolean isError() {
+ return !isSuccess();
+ }
+
+ public Boolean isSuccess() {
+ return R.SUCCESS == getCode();
+ }
}
--
Gitblit v1.9.3