From 50050ada04e8ae7bbbeb6342b4e3e35fba3890ec Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 17:36:47 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java
index 6e47fcc..2175b07 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java
@@ -3,11 +3,13 @@
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 定义统一返回对象
  */
 @ApiModel(value = "统一返回结果集")
+@Data
 public class ResultUtil<T> {
 
     public static final Integer SUCCESS = 200;
@@ -36,7 +38,6 @@
     private T data;//返回数据
 
 
-
     public String getMsg() {
         return msg;
     }
@@ -50,7 +51,7 @@
         return code;
     }
 
-    private ResultUtil(Integer code, String msg) {
+    public ResultUtil(Integer code, String msg) {
         this.code = code;
         this.msg = msg;
     }
@@ -62,127 +63,140 @@
     }
 
 
-    public static <T> ResultUtil<T> getResult(Integer code, String msg){
+    public static <T> ResultUtil<T> getResult(Integer code, String msg) {
         return new ResultUtil<>(code, msg);
     }
 
-    public static <T> ResultUtil<T> getResult(Integer code, String msg, T data){
+    public static <T> ResultUtil<T> getResult(Integer code, String msg, T data) {
         return new ResultUtil<>(code, msg, data);
     }
 
     /**
      * 错误信息
+     *
      * @return
      */
-    public static ResultUtil error(String mag){
+    public static ResultUtil error(String mag) {
         return ResultUtil.getResult(ResultUtil.ERROR, mag, new JSONObject());
     }
 
     /**
      * 错误信息
+     *
      * @return
      */
-    public static <T> ResultUtil <T> error(String mag, T obj){
+    public static <T> ResultUtil<T> error(String mag, T obj) {
         return ResultUtil.getResult(ResultUtil.ERROR, mag, obj);
     }
 
     /**
      * token失效
+     *
      * @return
      */
-    public static ResultUtil tokenErr(){
+    public static ResultUtil tokenErr() {
         return ResultUtil.getResult(ResultUtil.TOKEN_ERROR, ResultUtil.Token, new JSONObject());
     }
 
     /**
      * token失效
+     *
      * @return
      */
-    public static ResultUtil tokenErr(String msg){
+    public static ResultUtil tokenErr(String msg) {
         return ResultUtil.getResult(ResultUtil.TOKEN_ERROR, msg, new JSONObject());
     }
 
     /**
      * 参数异常
+     *
      * @return
      */
-    public static  ResultUtil paranErr(String ages){
+    public static ResultUtil paranErr(String ages) {
         return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "【" + ages + "】参数异常", new JSONObject());
     }
 
     /**
      * 参数异常
+     *
      * @return
      */
-    public static <T> ResultUtil<T> paranErr(T data){
+    public static <T> ResultUtil<T> paranErr(T data) {
         return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "PARAM_ERROR", data);
     }
 
 
     /**
      * 运行异常
+     *
      * @return
      */
-    public static ResultUtil runErr(){
+    public static ResultUtil runErr() {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "SYSTEM_RUN_ERROR", new JSONObject());
     }
 
 
     /**
      * 运行异常
+     *
      * @return
      */
-    public static <T>ResultUtil<T> runErr(T data){
+    public static <T> ResultUtil<T> runErr(T data) {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "SYSTEM_RUN_ERROR", data);
     }
 
     /**
      * 运行异常
+     *
      * @return
      */
-    public static <T>ResultUtil<T> runErr(T data, String msg){
+    public static <T> ResultUtil<T> runErr(T data, String msg) {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, msg, data);
     }
 
 
     /**
      * 返回成功
+     *
      * @param
      * @return
      */
-    public static ResultUtil success(){
+    public static ResultUtil success() {
         return ResultUtil.getResult(ResultUtil.SUCCESS, "SUCCESS", new JSONObject());
     }
 
 
     /**
      * 返回成功
+     *
      * @param data
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> success(T data){
+    public static <T> ResultUtil<T> success(T data) {
         return ResultUtil.getResult(ResultUtil.SUCCESS, "SUCCESS", data);
     }
 
     /**
      * 返回成功
+     *
      * @param msg
      * @param data
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> success(String msg, T data){
+    public static <T> ResultUtil<T> success(String msg, T data) {
         return ResultUtil.getResult(ResultUtil.SUCCESS, msg, data);
     }
 
 
     /**
      * 签名无效
+     *
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> sign(){
+    public static <T> ResultUtil<T> sign() {
         return ResultUtil.getResult(ResultUtil.SIGN_ERROR, SIGN);
     }
 

--
Gitblit v1.7.1