From 328b0158c3d97f87efc7da22a1e3f5a7c258b127 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 七月 2024 19:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
index d042858..b16511e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java
@@ -1,10 +1,14 @@
package com.vci.starter.web.pagemodel;
+import com.vci.starter.web.constant.PltWebConstant;
import com.vci.starter.web.enumpck.ResultCodeEnum;
import org.apache.commons.lang3.StringUtils;
+import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* 缁熶竴鐨勬暟鎹繑鍥炲璞★紝淇濊瘉feign銆乺estTemplate鎴栬�呭叾浠杛est璇锋眰瀹㈡埛绔彲浠ョ粺涓�澶勭悊
@@ -81,7 +85,7 @@
/**
* 鏁版嵁锛宔asyui浣跨敤鐨剅ows, extjs鍜宭ayui榛樿涓篸ata;easyui涔熷彲浠ヤ慨鏀逛负data锛屽洜姝ゅ潎浣跨敤data
*/
- private Collection<T> data ;
+ private Collection<T> data;
/**
* 鏍戠殑鏁版嵁
@@ -356,7 +360,51 @@
return baseResult;
}
+ /**
+ * 杩斿洖list
+ *
+ * @param data 鏁版嵁
+ * @param <T> T 娉涘瀷鏍囪
+ * @return R
+ */
+ public static <T> BaseResult<T> dataList(T data) {
+ return dataList(data, PltWebConstant.DEFAULT_SUCCESS_MESSAGE);
+ }
+ /**
+ * 杩斿洖list
+ *
+ * @param data 鏁版嵁
+ * @param msg 娑堟伅
+ * @param <T> T 娉涘瀷鏍囪
+ * @return R
+ */
+ public static <T> BaseResult<T> dataList(T data, String msg) {
+ return dataList(HttpServletResponse.SC_OK, data, msg);
+ }
+
+ /**
+ * 杩斿洖list
+ *
+ * @param code 鐘舵�佺爜
+ * @param data 鏁版嵁
+ * @param msg 娑堟伅
+ * @param <T> T 娉涘瀷鏍囪
+ * @return R
+ */
+ public static <T> BaseResult<T> dataList(int code, T data, String msg) {
+ return new BaseResult<>(code, data, data == null ? PltWebConstant.DEFAULT_NULL_MESSAGE : msg);
+ }
+
+ private BaseResult(int code, T data, String msg) {
+ this.code = code;
+ this.data = (Collection<T>) data;
+ this.msg = msg;
+ this.success = ResultCodeEnum.SUCCESS.code == code;
+ }
+
+ public BaseResult() {
+ }
/**
* 鏍规嵁鍒楄〃鑾峰彇缁熶竴鏁版嵁瀵硅薄
@@ -370,7 +418,6 @@
baseResult.setTreeData(treeList);
return baseResult;
}
-
@Override
public String toString() {
@@ -390,4 +437,5 @@
", treeData=" + treeData +
'}';
}
+
}
--
Gitblit v1.9.3