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/FaceDesignService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 5cc1b4d..5fe52a9 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONObject;
import com.product.admin.service.PublicService;
import com.product.common.lang.StringUtils;
+import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.CoreConst;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -48,9 +49,19 @@
if (DataTableEntity.isEmpty(fieldPropertyDt)) {
throw new BaseException(ErrorCode.GET_FACE_CONFIG_FAIL);
}
- List<JSONObject> result = FaceUtil.getFaceControlList(fse,fieldPropertyDt);
+ List<JSONObject> result = FaceUtil.getFaceControlList(fse, fieldPropertyDt);
Map<String, Object> other = new HashMap<>();
other.put("drawingList", result);
+ DataTableEntity faceCustomField = fse.getSubDataTable("product_sys_face_custom_field");
+ if (!DataTableEntity.isEmpty(faceCustomField)) {
+ for (int i = 0; i < faceCustomField.getRows(); i++) {
+ faceCustomField.setFieldValue(i, "customField", true);
+ faceCustomField.setFieldValue(i, "added", true);
+ }
+ other.put("product_sys_face_custom_field", BaseUtil.dataTableEntityToJson(faceCustomField));
+ } else {
+ other.put("product_sys_face_custom_field", new String[]{});
+ }
fse.getSubData().clear();
return BaseUtil.success(fse, other);
}
@@ -72,6 +83,13 @@
}
List<FieldSetEntity> fieldSetEntityList = new ArrayList<>();
for (int i = 0; i < fields.getRows(); i++) {
+ if (fields.getBoolean(i, "event_property")) {
+ DataTableEntity subDataTable = fields.getFieldSetEntity(i).getSubDataTable("event_array");
+ if (DataTableEntity.isEmpty(subDataTable)) {
+ continue;
+ }
+ fields.setFieldValue(i, "event_array", BaseUtil.dataTableEntityToJson(subDataTable));
+ }
fieldSetEntityList.addAll(controlTraverse(new JSONObject((Map) fields.getFieldSetEntity(i).getValues()), null, i));
}
fse.removeSubData(FaceConst.FACE_FIELD);
@@ -82,6 +100,9 @@
if (!StringUtils.isEmpty(fse.getUUID())) {
getBaseDao().delete(FaceConst.TABLE_FACE_FIELD_CONTROL_PROPERTY, "master_uuid=?", new Object[]{fse.getUUID()});
}
+ if (StringUtils.isEmpty(fse.getString("terminal_type"))) {
+ fse.setValue("terminal_type", 1);
+ }
getBaseDao().saveFieldSetEntity(fse);
fse.getSubData().clear();
return fse;
--
Gitblit v1.9.2