From 55fbf527317eca0969a108831983a7b69e727939 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 15 八月 2024 18:37:30 +0800
Subject: [PATCH] commit udpate
---
src/main/java/com/product/face/service/FaceCacheService.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceCacheService.java b/src/main/java/com/product/face/service/FaceCacheService.java
index edf1ce7..eb8989a 100644
--- a/src/main/java/com/product/face/service/FaceCacheService.java
+++ b/src/main/java/com/product/face/service/FaceCacheService.java
@@ -54,8 +54,8 @@
if (!StringUtils.isEmpty(uuid)) {
objects = new Object[]{uuid};
}
- DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects);
- if (!DataTableEntity.isEmpty(dt)) {
+ DataTableEntity dt = getBaseDao().listTable(FaceConst.TABLE_FACE_CONFIG, filter, objects, null, null, 0, 0, true);
+ if (DataTableEntity.isEmpty(dt)) {
return;
}
for (FieldSetEntity fs : dt.getData()) {
@@ -101,8 +101,8 @@
if (StringUtils.isEmpty(faceNumber)) {
return null;
}
- final String faceFormKey = FaceConst.FACE_FORM_CACHE_KEY + ":face-number" + faceNumber;
- return (FaceEntity) RedisUtil.get(faceFormKey);
+ FaceEntity face = (FaceEntity) RedisUtil.get(FaceConst.FACE_FORM_CACHE_KEY + faceNumber);
+ return face;
}
/**
@@ -117,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));
@@ -136,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;
@@ -148,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);
@@ -170,11 +180,13 @@
}
FieldSetEntity fieldInfo = BaseUtil.getSingleInfoByCache("琛ㄥ瓧娈典俊鎭�", new String[]{tableUuid, fieldName});
String label = config.getString(FaceConst.FIELD_PROPERTY_LABEL);
+ String fieldUuid = null;
+ String fieldReference = null;
if (!FieldSetEntity.isEmpty(fieldInfo)) {
- String fieldUuid = fieldInfo.getString(FaceConst.UUID);
- String fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
- faceListEntity.addField(fieldName, fieldUuid, label, tableColumn.getColumnWidth(), i, fieldReference);
+ fieldUuid = fieldInfo.getString(FaceConst.UUID);
+ fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
}
+ faceListEntity.addField(fieldName, fieldUuid, label, tableColumn.getColumnWidth(), i, fieldReference);
tableColumn.setField(fieldName);
tableColumn.setTitle(config.getString(FaceConst.FIELD_PROPERTY_LABEL));
result.add(tableColumn);
--
Gitblit v1.9.2