From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:22:30 +0800 Subject: [PATCH] update 适配 新序列化注解 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 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..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,10 +1,10 @@ package com.ruoyi.common.core.domain; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.common.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -14,8 +14,9 @@ */ @Data @NoArgsConstructor -@ApiModel("璇锋眰鍝嶅簲瀵硅薄") public class R<T> implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** @@ -28,33 +29,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,15 +60,36 @@ } 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); } public static <T> R<T> fail(int code, String msg) { 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) { @@ -81,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