From a680a84d91fb6501951d0265e9b347695568c546 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期二, 20 九月 2022 16:41:40 +0800
Subject: [PATCH] !236 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变） * 完善前端适配多字段排序功能案例OSS页面（完善排序图标显示效果和重置效果，支持正序，倒序，取消排序） * 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变）
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 91 ++++++++++++++++++---------------------------
1 files changed, 36 insertions(+), 55 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 4ce56f1..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,20 +1,28 @@
package com.ruoyi.common.core.domain;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
import java.io.Serializable;
/**
* 鍝嶅簲淇℃伅涓讳綋
*
- * @author ruoyi
+ * @author Lion Li
*/
-public class R<T> implements Serializable
-{
+@Data
+@NoArgsConstructor
+public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
- /** 鎴愬姛 */
- public static final int SUCCESS = 0;
+ /**
+ * 鎴愬姛
+ */
+ public static final int SUCCESS = 200;
- /** 澶辫触 */
+ /**
+ * 澶辫触
+ */
public static final int FAIL = 500;
private int code;
@@ -23,82 +31,55 @@
private T data;
- public static <T> R<T> ok()
- {
+ public static <T> R<T> ok() {
return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
}
- public static <T> R<T> ok(T data)
- {
+ public static <T> R<T> ok(T data) {
return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
}
- public static <T> R<T> ok(T data, String msg)
- {
+ public static <T> R<T> ok(String msg) {
+ return restResult(null, SUCCESS, msg);
+ }
+
+ public static <T> R<T> ok(String msg, T data) {
return restResult(data, SUCCESS, msg);
}
- public static <T> R<T> fail()
- {
+ public static <T> R<T> fail() {
return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
- public static <T> R<T> fail(String msg)
- {
+ public static <T> R<T> fail(String msg) {
return restResult(null, FAIL, msg);
}
- public static <T> R<T> fail(T data)
- {
+ public static <T> R<T> fail(T data) {
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);
}
- public static <T> R<T> fail(int code, String msg)
- {
+ public static <T> R<T> fail(int code, String msg) {
return restResult(null, code, msg);
}
- private static <T> R<T> restResult(T data, int code, String msg)
- {
- R<T> apiResult = new R<>();
- apiResult.setCode(code);
- apiResult.setData(data);
- apiResult.setMsg(msg);
- return apiResult;
+ private static <T> R<T> restResult(T data, int code, String msg) {
+ R<T> r = new R<>();
+ r.setCode(code);
+ r.setData(data);
+ r.setMsg(msg);
+ return r;
}
- public int getCode()
- {
- return code;
+ public Boolean isError() {
+ return !isSuccess();
}
- public void setCode(int code)
- {
- this.code = code;
- }
-
- public String getMsg()
- {
- return msg;
- }
-
- public void setMsg(String msg)
- {
- this.msg = msg;
- }
-
- public T getData()
- {
- return data;
- }
-
- public void setData(T data)
- {
- this.data = data;
+ public Boolean isSuccess() {
+ return R.SUCCESS == getCode();
}
}
--
Gitblit v1.9.3