From 9824fc1a7b71cb4d617ea18cab36b8c179e6a37c Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 05 十一月 2024 17:34:16 +0800
Subject: [PATCH] commit
---
src/main/java/com/product/face/service/FaceCacheService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index 51dcad4..eb8989a 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -54,7 +54,7 @@
if (!StringUtils.isEmpty(uuid)) {
objects = new Object[]{uuid};
}
- DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, Integer.MAX_VALUE, 1, true);
+ DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, 0, 0, true);
if (DataTableEntity.isEmpty(dt)) {
return;
}
@@ -101,7 +101,8 @@
if (StringUtils.isEmpty(faceNumber)) {
return null;
}
- return (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
+ FaceEntity face = (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
+ return face;
}
/**
@@ -116,7 +117,7 @@
}
fse.getSubData().clear();
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
- List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
if (faceControlList != null) {
FaceEntity face = new FaceEntity();
face.setData(BaseUtil.fieldSetEntityToJson(fse));
@@ -135,7 +136,7 @@
if (DataTableEntity.isEmpty(fieldPropertyDt)) {
return;
}
- List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fieldPropertyDt);
+ List<JSONObject> faceControlList = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
JSONObject jsonObject = faceControlList.get(0);
if (jsonObject == null || jsonObject.isEmpty()) {
return;
@@ -147,11 +148,21 @@
}
String faceNumber = fse.getString(FaceConst.FIELD_FACE_NUMBER);
String tableUuid = fse.getString(FaceConst.FIELD_TABLE_UUID);
+ String treeShow = fse.getString("tree_show");
+ String treeDataType = fse.getString("tree_data_type");
+ String treeDataSource = fse.getString("tree_datasource");
+ String treeLabelKey = fse.getString("tree_label_key");
+ String treeValueKey = fse.getString("tree_value_key");
List<TableColumn> result = Lists.newArrayList();
FaceListEntity faceListEntity = new FaceListEntity();
faceListEntity.setFaceName(faceNumber);
faceListEntity.setTableUuid(tableUuid);
faceListEntity.setUuid(fse.getUUID());
+ faceListEntity.setTreeShow(treeShow);
+ faceListEntity.setTreeDataType(treeDataType);
+ faceListEntity.setTreeDataSource(treeDataSource);
+ faceListEntity.setTreeLabelKey(treeLabelKey);
+ faceListEntity.setTreeValueKey(treeValueKey);
for (int i = 0; i < tableColumns.size(); i++) {
TableColumn tableColumn = new TableColumn();
JSONObject columnJson = tableColumns.getJSONObject(i);
--
Gitblit v1.9.2