From 929e9fedb97a88ef122100e03f775fedae79c474 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 04 六月 2025 15:08:53 +0800
Subject: [PATCH] 更新
---
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 129 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index 4f774d3..f608e99 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -1,14 +1,12 @@
package com.product.mobile.core.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.drew.metadata.Face;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -19,21 +17,19 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.service.support.AbstractBaseService;
+import com.product.face.entity.FaceListEntity;
+import com.product.face.service.FaceApplyService;
+import com.product.face.util.FaceUtil;
import com.product.mobile.core.config.MobileCoreCode;
-import com.product.mobile.core.config.MobileCoreConst;
import com.product.mobile.core.entity.FaceFieldEntity;
import com.product.tool.flow.config.CmnConst;
import com.product.tool.flow.service.FlowDetailService;
import com.product.util.BaseUtil;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.io.File;
-import java.nio.charset.Charset;
import java.util.*;
-import java.util.stream.Collectors;
/**
* @Author cheng
@@ -48,6 +44,8 @@
@Autowired
public BaseDao baseDao;
+ @Autowired
+ private FaceApplyService faceApplyService;
///鑾峰彇琛ㄥ崟鎬诲叆鍙�
/**
@@ -55,7 +53,7 @@
* @param fse浼犲叆琛ㄥ悕锛屾垨 琛║UID
* @return
*/
- public List<FaceFieldEntity> getFaceConfig(FieldSetEntity fse) {
+ public Object getFaceConfig(FieldSetEntity fse) {
String tableUuid = fse.getString("table_uuid");
if (tableUuid == null && StringUtils.isNotEmpty(fse.getString("uuid"))
@@ -86,7 +84,11 @@
}
}
- List<FaceFieldEntity> ls = getFaceFieldByTable(fse);
+ Object o = getFaceFieldByTable(fse);
+ if (o instanceof FaceListEntity) {
+ return o;
+ }
+ List<FaceFieldEntity> ls = (List<FaceFieldEntity>) o;
if (ls == null) ls = new ArrayList<FaceFieldEntity>();
addproperty(tableUuid, fse.getString("table_name"), ls);
//鎵�鏈夎〃鍗晆uid鑷姩娣诲姞锛屽苟涓篽idden
@@ -155,6 +157,7 @@
uuid.setType("String");
uuid.setTable(table_name);
uuid.setHidden("1");
+ uuid.setDisabled("1");
ls.add(uuid);
}
@@ -187,19 +190,28 @@
FaceFieldEntity uuid = new FaceFieldEntity();
FieldSetEntity f = dte.getFieldSetEntity(j);
if ("pk".equals(f.getString("field_type"))
+// || "created_by".equals(f.getString("field_name"))
+// || "created_utc_datetime".equals(f.getString("field_name"))
|| "updated_by".equals(f.getString("field_name"))
|| "updated_utc_datetime".equals(f.getString("field_name"))
|| "flowsign".equals(f.getString("field_type"))
- ) {
+ ) {
continue;
}
if ("uuid".equals(f.getString("field_name"))) {
uuid.setHidden("1");
+ uuid.setDisabled("1");
}
if ("userids".equals(f.getString("field_type")) || "orgUuids".equals(f.getString("field_type"))) {
uuid.setMultiple("1");
} else {
uuid.setMultiple("0");
+ }
+
+ if ("userids".equals(f.getString("field_type")) || "userid".equals(f.getString("field_type"))) {
+ uuid.setOrganizationType("5");
+ } else if ("orgUuids".equals(f.getString("field_type")) || "orgUuid".equals(f.getString("field_type"))) {
+ uuid.setOrganizationType("2");
}
uuid.setComponentType("");
@@ -225,7 +237,7 @@
}
}
- public List<FaceFieldEntity> getFaceFieldByTable(FieldSetEntity fse) {
+ public Object getFaceFieldByTable(FieldSetEntity fse) {
String tableUuid = fse.getString("table_uuid");
String tableName = fse.getString("table_name");
if (StringUtils.isEmpty(tableUuid) && !StringUtils.isEmpty(tableName)) {
@@ -237,8 +249,13 @@
if (StringUtils.isEmpty(tableUuid)) {
throw new BaseException(MobileCoreCode.SYSTEM_FORM_COUNT);
}
- FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=2", new Object[]{tableUuid}, true);
+ String faceType = BaseUtil.ifNull(fse.getString("face_type"), "2");
+ FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=?", new Object[]{tableUuid, faceType}, true);
faceFse.setTableName(tableName);
+ if ("1".equals(faceType) && !FieldSetEntity.isEmpty(faceFse)) {
+ //鍒楄〃
+ return faceApplyService.getFaceListConf(faceFse);
+ }
return getFaceField(faceFse);
}
@@ -343,6 +360,7 @@
map.put(fieldSetEntity3.getString("property_name"), fieldSetEntity3.getString("property_value"));
if ("__config__".equals(fieldSetEntity3.getString("property_name"))) {
configValueList = parentMap.get(fieldSetEntity3.getString("uuid"));
+ map.put("__config__", configValueList);
}
if ("children".equals(fieldSetEntity3.getString("property_name"))) {
tabsChldren = fieldSetEntity3.getString("property_value");
@@ -350,17 +368,40 @@
}
if (map.get("tag") != null && "el-tabs".equals(map.get("tag"))) {
map.remove("label");
- if(tabsChldren != null){
+ if (tabsChldren != null) {
}
}
group.put(parentUuid1, map);
o = map;
+ } else {
+ configValueList = (List<FieldSetEntity>) o.get("__config__");
}
result.get(i).putOtherParam("parentContainerName", BaseUtil.ifNull(o.get("title"), o.get("label")));
result.get(i).putOtherParam("parentContainer", parentUuid1);
Map<String, Object> configValueMap = null;
+ if (configValueList != null) {
+
+ //鑾峰彇property_name=showComponentFilter
+ Optional<FieldSetEntity> showComponentFilter = configValueList.stream().filter(fieldSetEntity1 -> "showComponentFilter".equals(fieldSetEntity1.getString("property_name"))).findFirst();
+ if (showComponentFilter.isPresent()) {
+ String u = showComponentFilter.get().getString("uuid");
+ List<FieldSetEntity> fieldSetEntities = parentMap.get(u);
+ JSONArray arrFilter = null;
+ if (fieldSetEntities != null && !fieldSetEntities.isEmpty()) {
+ JSONObject propertyJson = FaceUtil.getPropertyJson(Lists.newArrayList(showComponentFilter.get()), parentMap);
+ arrFilter = propertyJson.getJSONArray("showComponentFilter");
+ }
+ if (arrFilter != null) {
+ if (result.get(i).getShowComponentFilter() == null) {
+ result.get(i).setShowComponentFilter(arrFilter);
+ } else {
+ result.get(i).getShowComponentFilter().addAll(arrFilter);
+ }
+ }
+ }
+ }
if (o.get("configValue") != null) {
configValueMap = (Map<String, Object>) o.get("configValue");
}
@@ -453,6 +494,19 @@
faceFieldEntity.setAllowDelete(setEntity.getBoolean("property_value"));
} else if ("control_sequence".equals(propertyName)) {
faceFieldEntity.putOtherParam("controlSequence", setEntity.getInteger("property_value"));
+ } else if ("__config__".equals(propertyName)) {
+
+ String __config__ = setEntity.getUUID();
+ List<FieldSetEntity> fieldSetEntities2 = parentMap.get(__config__);
+ if (!CollectionUtil.isEmpty(fieldSetEntities2)) {
+ for (FieldSetEntity fieldSetEntity4 : fieldSetEntities2) {
+ if ("label".equals(fieldSetEntity4.getString("property_name"))) {
+ faceFieldEntity.setName(fieldSetEntity4.getString("property_value"));
+ } else if ("required".equals(fieldSetEntity4.getString("property_name"))) {
+ faceFieldEntity.setRequired(fieldSetEntity4.getBoolean("property_value") ? "1" : "0");
+ }
+ }
+ }
}
}
List<FaceFieldEntity> subFieldList = faceFieldEntity.getSubField();
@@ -481,35 +535,10 @@
return result;
}
- public static void main(String[] args) {
-
- String textFilePath = "d:\\Desktop\\鏂板缓 鏂囨湰鏂囨。 (2).txt";
-
- List<String> lines = FileUtil.readLines(new File(textFilePath), CharsetUtil.defaultCharset());
- for (int i = 0; i < lines.size(); i++) {
- //UPDATE `product_db_lift`.`product_sys_datamodel_table` SET `uuid` = '4503ea5c-1e10-40b6-a2b4-79760eea6474', `table_name` = 'product_deivce_failure_level_config', `table_description` = '璁惧鏁呴殰绛夌骇閰嶇疆', `table_primary_key` = NULL, `container_name` = NULL, `table_base_view` = NULL, `view_sql` = NULL, `org_level_uuid` = NULL, `is_international` = NULL, `table_type` = '1', `created_by` = '1', `created_utc_datetime` = '2024-08-09 00:00:00', `updated_by` = '1', `updated_utc_datetime` = '2024-08-09 00:00:00', `produce_msg` = NULL, `sequence` = 2, `view_status` = NULL WHERE `table_id` = 5300;
- String line = lines.get(i);
- line = line.replaceAll("`", "");
- String start = line.substring(line.indexOf("SET") + 3, line.indexOf("WHERE"));
- String[] split = start.split(",");
- Map<String, String> map = new HashMap<>();
- for (String s : split) {
- String[] split1 = s.split("=");
- String value = split1.length == 1 ? null : split1[1].trim();
- if ("null".equalsIgnoreCase(value)) {
- value = null;
- }
- map.put(split1[0].trim(), value);
-
- }
- lines.set(i, lines.get(i).substring(0, lines.get(i).indexOf("WHERE")) + " WHERE `uuid`=" + map.get("uuid") + ";");
- }
- FileUtil.writeLines(lines, textFilePath, CharsetUtil.defaultCharset());
- }
-
private void to(Map<String, List<FieldSetEntity>> groupMap, List<FieldSetEntity> fieldSetEntity, Map<String, List<FieldSetEntity>> subTableField, List<FaceFieldEntity> result, Map<String, List<FieldSetEntity>> parentMap) {
FieldSetEntity parent = fieldSetEntity.get(0);
+ Map<String, List<FieldSetEntity>> oldParentMap = Maps.newHashMap(parentMap);
String groupUuid1 = parent.getString("group_uuid");
if (StringUtils.isEmpty(groupUuid1)) {
return;
@@ -546,6 +575,17 @@
propertyName = "prompt";
} else if ("__config__".equals(propertyName)) {
__config__ = setEntity.getUUID();
+ List<FieldSetEntity> fieldSetEntities = oldParentMap.get(__config__);
+ if (!CollectionUtil.isEmpty(fieldSetEntities)) {
+ //鏌ヨshowComponentFilter
+ Optional<FieldSetEntity> propertyName1 = fieldSetEntities.stream().filter(item -> "showComponentFilter".equals(item.getString("property_name"))).findFirst();
+ if (propertyName1.isPresent()) {
+ JSONObject propertyJson = FaceUtil.getPropertyJson(Lists.newArrayList(propertyName1.get()), oldParentMap);
+ if (propertyJson != null && propertyJson.get("showComponentFilter") != null) {
+ faceFieldEntity.addShowComponentFilter(propertyJson.getJSONArray("showComponentFilter"));
+ }
+ }
+ }
}
if (!StringUtils.isAnyEmpty(__config__)) {
//璇诲彇瀛愯〃灞炴��
@@ -610,8 +650,15 @@
if ("defaultValue".equals(propertyName) && !"0".equals(setEntity.getString("property_value")) && !"1".equals(setEntity.getString("property_value"))) {
continue;
}
+ Object propertyValue = setEntity.getObject("property_value");
+ if (oldParentMap != null && propertyValue == null && StringUtils.equalsAny(setEntity.getString("property_type"), "2", "3", "4")) {
+ JSONObject propertyJson = FaceUtil.getPropertyJson(Lists.newArrayList(setEntity), oldParentMap);
+ if (propertyJson != null && propertyJson.get(setEntity.getString("property_name")) != null) {
+ propertyValue = propertyJson.get(setEntity.getString("property_name"));
+ }
+ }
if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName) && !"field".equals(setEntity.getString("property_name")) && !"prompt".equals(setEntity.getString("property_name"))) {
- ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
+ ReflectUtil.setFieldValue(faceFieldEntity, propertyName, propertyValue);
}
}
}
--
Gitblit v1.9.2