From df6867ee052790c3d690f341c422540e47ae5ec3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 10:52:14 +0800
Subject: [PATCH] update 优化 默认开启复杂结构 resultMap 自动映射 简化xml编码(多结构实体需带上主键id)
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 999974d..a31c323 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,9 +1,10 @@
package com.ruoyi.common.core.domain;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.ruoyi.common.constant.HttpStatus;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serial;
import java.io.Serializable;
/**
@@ -13,8 +14,9 @@
*/
@Data
@NoArgsConstructor
-@Schema(name = "璇锋眰鍝嶅簲瀵硅薄")
public class R<T> implements Serializable {
+
+ @Serial
private static final long serialVersionUID = 1L;
/**
@@ -27,13 +29,10 @@
*/
public static final int FAIL = 500;
- @Schema(name = "娑堟伅鐘舵�佺爜")
private int code;
- @Schema(name = "娑堟伅鍐呭")
private String msg;
- @Schema(name = "鏁版嵁瀵硅薄")
private T data;
public static <T> R<T> ok() {
@@ -72,6 +71,27 @@
return restResult(null, code, msg);
}
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @return 璀﹀憡娑堟伅
+ */
+ public static <T> R<T> warn(String msg) {
+ return restResult(null, HttpStatus.WARN, msg);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ * @return 璀﹀憡娑堟伅
+ */
+ public static <T> R<T> warn(String msg, T data) {
+ return restResult(data, HttpStatus.WARN, msg);
+ }
+
private static <T> R<T> restResult(T data, int code, String msg) {
R<T> r = new R<>();
r.setCode(code);
@@ -80,4 +100,11 @@
return r;
}
+ public static <T> Boolean isError(R<T> ret) {
+ return !isSuccess(ret);
+ }
+
+ public static <T> Boolean isSuccess(R<T> ret) {
+ return R.SUCCESS == ret.getCode();
+ }
}
--
Gitblit v1.9.3