From ac070bd08ba4cb6c1e3bf670db75b6a8e801b84b Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 17 十一月 2025 18:00:30 +0800
Subject: [PATCH] 表单建模树优化
---
src/main/java/com/product/face/service/FaceDesignService.java | 9 +++++++++
src/main/java/com/product/face/service/ide/IFaceDesignService.java | 14 +++++++++++++-
src/main/java/com/product/face/controller/FaceDesignController.java | 28 +++++++++++++++++++++++++++-
3 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/face/controller/FaceDesignController.java b/src/main/java/com/product/face/controller/FaceDesignController.java
index 42829f9..5b8658e 100644
--- a/src/main/java/com/product/face/controller/FaceDesignController.java
+++ b/src/main/java/com/product/face/controller/FaceDesignController.java
@@ -33,7 +33,8 @@
@Resource
private IFaceDesignService faceDesignService;
-
+
+
/**
* 琛ㄥ崟鍒楄〃宸︿晶鏍�
*
@@ -42,6 +43,31 @@
@PostMapping("/tree-face/{version}")
@ApiVersion(1)
public String faceListTree() {
+ // 鑾峰彇鎵�鏈夎〃鏁版嵁銆佹墍鏈夎〃鍗曟暟鎹�
+ DataTableEntity tableData = faceDesignService.listAllTable();
+ DataTableEntity tablePage = faceDesignService.listAllDesignFace();
+ if (!DataTableEntity.isEmpty(tableData) && !DataTableEntity.isEmpty(tablePage)) {
+ for (int i = 0; i < tableData.getRows(); i++) {
+ FieldSetEntity fseTable = tableData.getFieldSetEntity(i);
+ fseTable.setValue("value", fseTable.getUUID());
+ // 瀛愰泦瀹瑰櫒
+ DataTableEntity dtChildren = new DataTableEntity();
+ for (int j = 0; j < tablePage.getRows(); j++) {
+ FieldSetEntity fsePage = tablePage.getFieldSetEntity(j);
+ fsePage.setValue("value", fsePage.getUUID());
+ fsePage.setTableName("children");
+ if ((fseTable.getUUID()).equals(fsePage.getString( "table_uuid"))) {
+ dtChildren.addFieldSetEntity(fsePage);
+ }
+ }
+ fseTable.addSubDataTable(dtChildren);
+ }
+ }
+ return success(tableData);
+ }
+ @PostMapping("/tree-face2/{version}")
+ @ApiVersion(1)
+ public String faceListTree2() {
DataTableEntity tableInfoData = DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夎〃淇℃伅");
List<Map<String, Object>> resultList = new ArrayList<>();
if (!DataTableEntity.isEmpty(tableInfoData)) {
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index bb32bdc..3480f04 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -17,6 +17,7 @@
import com.product.face.config.FaceConst;
import com.product.face.service.ide.IFaceDesignService;
import com.product.face.util.FaceUtil;
+import com.product.file.config.CmnConst;
import com.product.util.BaseUtil;
import org.apache.poi.hdgf.pointers.Pointer;
import org.apache.poi.ss.formula.functions.T;
@@ -37,6 +38,14 @@
@Resource
public PublicService publicService;
+ public DataTableEntity listAllTable(){
+ return getBaseDao().listTable("product_sys_datamodel_table", null, "table_type ASC");
+ }
+
+ public DataTableEntity listAllDesignFace(){
+ return getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG);
+ }
+
/**
* 鑾峰彇琛ㄥ崟閰嶇疆璇︽儏
*
diff --git a/src/main/java/com/product/face/service/ide/IFaceDesignService.java b/src/main/java/com/product/face/service/ide/IFaceDesignService.java
index 33b3a26..ee1e7e2 100644
--- a/src/main/java/com/product/face/service/ide/IFaceDesignService.java
+++ b/src/main/java/com/product/face/service/ide/IFaceDesignService.java
@@ -37,5 +37,17 @@
* @throws BaseException
*/
void deleteFace(FieldSetEntity fse) throws BaseException;
-
+
+ /**
+ * 鑾峰彇鎵�鏈夎璁￠〉闈�
+ * @return
+ * @throws BaseException
+ */
+ DataTableEntity listAllDesignFace() throws BaseException;
+ /**
+ * 鑾峰彇鎵�鏈夎璁￠〉闈�
+ * @return
+ * @throws BaseException
+ */
+ DataTableEntity listAllTable() throws BaseException;
}
--
Gitblit v1.9.2