From 4d3f7f10d422fd6eee128fa32bc48ce7b10ec09d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期二, 07 一月 2025 18:24:21 +0800
Subject: [PATCH] 属性定义参照类型改成下拉树选择，处理值域显示不正确的问题，属性名选择改为下拉搜索
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseResult.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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..d0c8185 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,12 +85,12 @@
/**
* 鏁版嵁锛宔asyui浣跨敤鐨剅ows, extjs鍜宭ayui榛樿涓篸ata;easyui涔熷彲浠ヤ慨鏀逛负data锛屽洜姝ゅ潎浣跨敤data
*/
- private Collection<T> data ;
+ private Collection<T> data;
/**
* 鏍戠殑鏁版嵁
*/
- private Collection<Tree> treeData;
+ private Collection<BaseTree> treeData;
public Object[] getMsgObjs() {
return msgObjs;
@@ -192,11 +196,11 @@
this.data = data;
}
- public Collection<Tree> getTreeData() {
+ public Collection<BaseTree> getTreeData() {
return treeData;
}
- public void setTreeData(Collection<Tree> treeData) {
+ public void setTreeData(Collection<BaseTree> treeData) {
this.treeData = treeData;
}
@@ -356,21 +360,64 @@
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() {
+ }
/**
* 鏍规嵁鍒楄〃鑾峰彇缁熶竴鏁版嵁瀵硅薄
* @param treeList 鏍戣妭鐐归泦鍚�
* @return 缁熶竴鏁版嵁瀵硅薄
*/
- public static BaseResult tree(Collection<Tree> treeList){
+ public static BaseResult tree(Collection<? extends BaseTree> treeList){
BaseResult baseResult = new BaseResult<>();
baseResult.setCode(ResultCodeEnum.SUCCESS.code);
baseResult.setSuccess(true);
baseResult.setTreeData(treeList);
return baseResult;
}
-
@Override
public String toString() {
@@ -390,4 +437,5 @@
", treeData=" + treeData +
'}';
}
+
}
--
Gitblit v1.9.3