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 | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 f868e8e..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,21 +25,18 @@
*/
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) {
@@ -54,7 +48,7 @@
}
public static <T> R<T> fail() {
- return restResult(null, FAIL, null);
+ return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg) {
@@ -62,7 +56,7 @@
}
public static <T> R<T> fail(T data) {
- return restResult(data, FAIL, null);
+ return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg, T data) {
@@ -81,4 +75,11 @@
return r;
}
+ public Boolean isError() {
+ return !isSuccess();
+ }
+
+ public Boolean isSuccess() {
+ return R.SUCCESS == getCode();
+ }
}
--
Gitblit v1.9.3