shuhao

src/main/java/com/xiesx/fastboot/base/result/BaseResult.java

@@ -13,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @Builder
-public class BaseResult<T,E> {
+public class BaseResult<T> {
 
 
     public static String OP_MSG_SUCC = "success";
@@ -45,7 +45,7 @@ public class BaseResult<T,E> {
 
     // 数据
     @JSONField(ordinal = 4)
-    private E extData;
+    private Object extData;
 
     /**
      * 判断是否成功并返回

src/main/java/com/xiesx/fastboot/base/result/R.java

@@ -1,153 +1,129 @@
 package com.xiesx.fastboot.base.result;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.Feature;
-
 import lombok.NonNull;
 
-/**
- * @title R.java
- * @description 返回值快速构造类
- * @author Sixian.xie
- * @date 2020-7-21 22:30:11
- */
+import java.util.List;
+
 public class R {
 
-    /**
-     * 成功
-     */
-    public static BaseResult succ() {
-        return BaseResult.builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).build();
+    /** 成功 */
+    public static <T> BaseResult<T> succ() {
+        return BaseResult.<T>builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).build();
     }
 
-    public static BaseResult succ(@NonNull String msg) {
-        return BaseResult.builder().code(BaseResult.SUCCESS).msg(msg).build();
+    public static <T> BaseResult<T> succ(@NonNull String msg) {
+        return BaseResult.<T>builder().code(BaseResult.SUCCESS).msg(msg).build();
     }
 
-    public static BaseResult succ(Object data) {
+    public static <T> BaseResult<T> succ(T data) {
         if(data == null){
             return succ();
         }
-        return BaseResult.builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).data(data).build();
+        return BaseResult.<T>builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).data(data).build();
     }
 
-    public static BaseResult succ(Object data, Object extData) {
+    public static <T, E> BaseResult<T> succ(T data, E extData) {
         if(data == null){
             return succ();
         }
-        return BaseResult.builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).data(data).extData(extData).build();
+        return BaseResult.<T>builder().code(BaseResult.SUCCESS).msg(BaseResult.OP_MSG_SUCC).data(data).extData(extData).build();
     }
 
-    public static BaseResult succ(@NonNull String msg, @NonNull Object data) {
-        return BaseResult.builder().code(BaseResult.SUCCESS).msg(msg).data(data).build();
+    public static <T> BaseResult<T> succ(@NonNull String msg, @NonNull T data) {
+        return BaseResult.<T>builder().code(BaseResult.SUCCESS).msg(msg).data(data).build();
     }
 
-    public static BaseResult succ(@NonNull Integer code, @NonNull String msg) {
-        return BaseResult.builder().code(code).msg(msg).build();
+    public static <T> BaseResult<T> succ(@NonNull Integer code, @NonNull String msg) {
+        return BaseResult.<T>builder().code(code).msg(msg).build();
     }
 
-    public static BaseResult succ(@NonNull Integer code, @NonNull String msg, @NonNull Object data) {
-        return BaseResult.builder().code(code).msg(msg).data(data).build();
+    public static <T> BaseResult<T> succ(@NonNull Integer code, @NonNull String msg, @NonNull T data) {
+        return BaseResult.<T>builder().code(code).msg(msg).data(data).build();
     }
 
-    /**
-     * 失败
-     */
-    public static BaseResult fail() {
-        return BaseResult.builder().code(BaseResult.FAIL).msg(BaseResult.OP_MSG_FAIL).build();
+    /** 失败 */
+    public static <T> BaseResult<T> fail() {
+        return BaseResult.<T>builder().code(BaseResult.FAIL).msg(BaseResult.OP_MSG_FAIL).build();
     }
 
-    public static BaseResult fail(@NonNull String msg) {
-        return BaseResult.builder().code(BaseResult.FAIL).msg(msg).build();
+    public static <T> BaseResult<T> fail(@NonNull String msg) {
+        return BaseResult.<T>builder().code(BaseResult.FAIL).msg(msg).build();
     }
 
-    public static BaseResult fail(@NonNull Object data) {
-        return BaseResult.builder().code(BaseResult.FAIL).msg(BaseResult.OP_MSG_FAIL).data(data).build();
+    public static <T> BaseResult<T> fail(@NonNull T data) {
+        return BaseResult.<T>builder().code(BaseResult.FAIL).msg(BaseResult.OP_MSG_FAIL).data(data).build();
     }
 
-    public static BaseResult fail(@NonNull String msg, Object data) {
-        return BaseResult.builder().code(BaseResult.FAIL).msg(msg).data(data).build();
+    public static <T> BaseResult<T> fail(@NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(BaseResult.FAIL).msg(msg).data(data).build();
     }
 
-    public static BaseResult fail(@NonNull Integer code, @NonNull String msg) {
-        return BaseResult.builder().code(code).msg(msg).build();
+    public static <T> BaseResult<T> fail(@NonNull Integer code, @NonNull String msg) {
+        return BaseResult.<T>builder().code(code).msg(msg).build();
     }
 
-    public static BaseResult fail(@NonNull Integer code, @NonNull String msg, Object data) {
-        return BaseResult.builder().code(code).msg(msg).data(data).build();
+    public static <T> BaseResult<T> fail(@NonNull Integer code, @NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(code).msg(msg).data(data).build();
     }
 
-    /**
-     * 异常
-     */
-    public static BaseResult error() {
-        return BaseResult.builder().code(BaseResult.ERROR).msg(BaseResult.OP_MSG_FAIL).build();
+    /** 异常 */
+    public static <T> BaseResult<T> error() {
+        return BaseResult.<T>builder().code(BaseResult.ERROR).msg(BaseResult.OP_MSG_FAIL).build();
     }
 
-    public static BaseResult error(@NonNull String msg) {
-        return BaseResult.builder().code(BaseResult.ERROR).msg(msg).build();
+    public static <T> BaseResult<T> error(@NonNull String msg) {
+        return BaseResult.<T>builder().code(BaseResult.ERROR).msg(msg).build();
     }
 
-    public static BaseResult error(@NonNull Object data) {
-        return BaseResult.builder().code(BaseResult.ERROR).msg(BaseResult.OP_MSG_FAIL).data(data).build();
+    public static <T> BaseResult<T> error(@NonNull T data) {
+        return BaseResult.<T>builder().code(BaseResult.ERROR).msg(BaseResult.OP_MSG_FAIL).data(data).build();
     }
 
-    public static BaseResult error(@NonNull String msg, Object data) {
-        return BaseResult.builder().code(BaseResult.ERROR).msg(msg).data(data).build();
+    public static <T> BaseResult<T> error(@NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(BaseResult.ERROR).msg(msg).data(data).build();
     }
 
-    public static BaseResult error(@NonNull Integer code, @NonNull String msg) {
-        return BaseResult.builder().code(code).msg(msg).build();
+    public static <T> BaseResult<T> error(@NonNull Integer code, @NonNull String msg) {
+        return BaseResult.<T>builder().code(code).msg(msg).build();
     }
 
-    public static BaseResult error(@NonNull Integer code, @NonNull String msg, Object data) {
-        return BaseResult.builder().code(code).msg(msg).data(data).build();
+    public static <T> BaseResult<T> error(@NonNull Integer code, @NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(code).msg(msg).data(data).build();
     }
 
-    /**
-     * 重试
-     */
-    public static BaseResult retry() {
-        return BaseResult.builder().code(BaseResult.RETRY).msg(BaseResult.OP_MSG_FAI_RETRY).build();
+    /** 重试 */
+    public static <T> BaseResult<T> retry() {
+        return BaseResult.<T>builder().code(BaseResult.RETRY).msg(BaseResult.OP_MSG_FAI_RETRY).build();
     }
 
-    public static BaseResult retry(@NonNull String msg) {
-        return BaseResult.builder().code(BaseResult.RETRY).msg(msg).build();
+    public static <T> BaseResult<T> retry(@NonNull String msg) {
+        return BaseResult.<T>builder().code(BaseResult.RETRY).msg(msg).build();
     }
 
-    public static BaseResult retry(@NonNull Object data) {
-        return BaseResult.builder().code(BaseResult.RETRY).msg(BaseResult.OP_MSG_FAI_RETRY).data(data).build();
+    public static <T> BaseResult<T> retry(@NonNull T data) {
+        return BaseResult.<T>builder().code(BaseResult.RETRY).msg(BaseResult.OP_MSG_FAI_RETRY).data(data).build();
     }
 
-    public static BaseResult retry(@NonNull String msg, Object data) {
-        return BaseResult.builder().code(BaseResult.RETRY).msg(msg).data(data).build();
+    public static <T> BaseResult<T> retry(@NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(BaseResult.RETRY).msg(msg).data(data).build();
     }
 
-    public static BaseResult retry(@NonNull Integer code, @NonNull String msg) {
-        return BaseResult.builder().code(code).msg(msg).build();
+    public static <T> BaseResult<T> retry(@NonNull Integer code, @NonNull String msg) {
+        return BaseResult.<T>builder().code(code).msg(msg).build();
     }
 
-    public static BaseResult retry(@NonNull Integer code, @NonNull String msg, Object data) {
-        return BaseResult.builder().code(code).msg(msg).data(data).build();
+    public static <T> BaseResult<T> retry(@NonNull Integer code, @NonNull String msg, T data) {
+        return BaseResult.<T>builder().code(code).msg(msg).data(data).build();
     }
 
-
-    /**
-     * str 转 jsonObject
-     */
+    /** str 转 jsonObject */
     public static <T> T parseObject(String text, Class<T> clazz) {
         return JSON.parseObject(text, clazz, new Feature[0]);
     }
 
-    /**
-     * str 转 jsonArray
-     *
-     * @param text
-     * @param clazz
-     * @return
-     */
+    /** str 转 jsonArray */
     public static <T> List<T> parseArray(String text, Class<T> clazz) {
         return JSON.parseArray(text, clazz);
     }