From 22c1eb1ce515eca32b76beeec312b8fa610f6f74 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期二, 08 十月 2024 11:22:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0 into dev

---
 src/main/java/com/product/mobile/core/service/FaceMobileService.java |  419 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 388 insertions(+), 31 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 310b02f..0765f0c 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -1,25 +1,34 @@
 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.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.drew.metadata.Face;
+import com.google.common.collect.Sets;
 import com.product.common.lang.StringUtils;
+import com.product.core.cache.DataPoolCacheImpl;
+import com.product.core.dao.BaseDao;
 import com.product.core.entity.DataTableEntity;
 import com.product.core.entity.FieldSetEntity;
 import com.product.core.exception.BaseException;
 import com.product.core.service.support.AbstractBaseService;
-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.config.FlowCode;
 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.*;
 
 /**
@@ -32,8 +41,190 @@
 
 	@Resource
 	FlowDetailService flowDetailService;
+	
+	@Autowired
+	public BaseDao baseDao;
+	
+	///鑾峰彇琛ㄥ崟鎬诲叆鍙�
+	/**
+	 * 
+	 * @param fse浼犲叆琛ㄥ悕锛屾垨 琛║UID
+	 * @return
+	 */
+	public List<FaceFieldEntity> getFaceConfig(FieldSetEntity fse) {
+	
+		String tableUuid=fse.getString("table_uuid");
+		if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("uuid"))
+				&& StringUtils.isEmpty(fse.getString("table_name"))) {
+			//閫氳繃涓氬姟琛ㄤ俊鎭煡琛ㄥ崟淇℃伅
+			FieldSetEntity detailFse = getBaseDao().getFieldSetEntity(CmnConst.TABLE_FLOW_DETAIL, fse.getString(CmnConst.FIELD_UUID), false);
+			if(detailFse!=null) {
+				//鑾峰彇琛ㄥ悕
+				fse.setValue("table_name", detailFse.getString("table_name"));
+			}
+			
+		}
+		//閫氳繃瀹℃壒浠诲姟鐨剈uid鏉ユ煡琛ㄥ崟淇℃伅
+		if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("table_name"))) {
+			FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅", new String[]{fse.getString("table_name")});
+			if (!FieldSetEntity.isEmpty(tableInfo)) {
+				tableUuid = tableInfo.getString("uuid");
+				fse.setValue("table_uuid", tableUuid);
+			}
+		}
+		
+		if(tableUuid!=null && fse.getString("table_name")==null) {
+			
+			FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅(uuid)", new String[]{tableUuid});
+			if (!FieldSetEntity.isEmpty(tableInfo)) {
+				//鑾峰彇琛ㄥ悕
+				fse.setValue("table_name", tableInfo.getString("table_name"));
+			}
+		}
+		
+		List<FaceFieldEntity> ls=getFaceFieldByTable(fse);
+		if(ls==null)ls=new ArrayList<FaceFieldEntity>();
+		addproperty(tableUuid,fse.getString("table_name"),ls);
+		//鎵�鏈夎〃鍗晆uid鑷姩娣诲姞锛屽苟涓篽idden
+		return ls;
+		
+	}
+	//閫掑綊鎶婁富琛ㄥ拰瀛愯〃鐨勫瓧娈靛睘鎬ф坊鍔犺繘鍘伙紝濡傛灉娌℃湁閰嶈〃鍗曪紝鍒欏彇琛ㄦ暟鎹粨鏋勮繘琛屽睍绀�
+	/**
+	 * 
+	 * @param ls鏌ュ嚭鏉ョ殑琛ㄥ崟淇℃伅
+	 * @param tables 璁板綍鐨勬墍鏈夎〃锛屽搴旂殑琛ㄥ崟淇℃伅
+	 */
+	private void  addproperty(String table_uuid,String table_name,List<FaceFieldEntity> ls) {
+		if(ls.size()>0) {
+			for(int i=0;i<ls.size();i++) {
+				String subTableName=ls.get(i).getSubTableName();///鍙兘鏄瓙琛�
+				if(StringUtils.isEmpty(subTableName)) {///涓昏〃瀛楁
+					DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("琛ㄥ瓧娈典俊鎭�"
+							,new String[] {table_uuid,ls.get(i).getField()});
+					
+					if(!DataTableEntity.isEmpty(dt)) {
+//						if(StringUtils.isEmpty(ls.get(i).getType())) {
+//							ls.get(i).setType(dt.getFieldSetEntity(0).getString("field_type"));
+//						}
+						if(StringUtils.isEmpty(ls.get(i).getPrompt()) && 
+								!StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("field_reference"))) {
+							ls.get(i).setPrompt(dt.getFieldSetEntity(0).getString("field_reference"));
+						}
+						if(StringUtils.isEmpty(ls.get(i).getRequired()) && 
+								!StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("is_required"))) {
+							ls.get(i).setRequired(dt.getFieldSetEntity(0).getString("is_required"));
+						}
+						if(StringUtils.isEmpty(ls.get(i).getName()) && 
+								!StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("field_show_name"))) {
+							ls.get(i).setName(dt.getFieldSetEntity(0).getString("field_show_name"));
+						}
+					}
+					ls.get(i).setTable(table_name);
+				}else {
+					//============鎶婂瓙琛ㄥ瓧娈典篃澶勭悊涓�涓�
+					//瀛愯〃
+					FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅", new String[]{subTableName});
+					if (!FieldSetEntity.isEmpty(tableInfo)) {
+						addproperty(tableInfo.getString("uuid"),tableInfo.getString("table_name"),ls.get(i).getSubField());
+					}
+				}
+				
+			}
+			DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("琛ㄥ瓧娈典俊鎭�",new String[] {table_uuid,"uuid"});
+			if(!DataTableEntity.isEmpty(dt)) {
+				FaceFieldEntity uuid=new FaceFieldEntity();
+				uuid.setComponentType("uuid");
+				uuid.setField("uuid");
+				uuid.setName("缂�  鐮�");
+				uuid.setType("String");
+				uuid.setTable(table_name);
+				uuid.setHidden("1"); 
+				ls.add(uuid);
+			}
+			
+		}else {///浠ヨ〃鍗曡璁′负鍑嗭紝濡傛灉娌℃湁閰嶇疆琛ㄥ崟锛屽垯浠ユ暟鎹〃涓哄噯锛屽叏閮ㄤ繚鐣�
+			toConvertFace(table_uuid,table_name,ls,null);
+			//杩斿洖瀛愯〃
+			Object [][]sub=baseDao.getSubTableName(table_name);
+			if(sub!=null && sub.length>0&&sub[0].length>0) {
+				for(int i=0;i<sub[0].length;i++) {
+					toConvertFace(sub[0][i].toString(),sub[1][i].toString(),new ArrayList<FaceFieldEntity>(),ls);
+				}
+			}
+			
+		}
+	}
+	/**
+	 * 鏁版嵁搴撹〃瀛楁瀹氫箟杞崲鎴愯〃鍗曞畾涔�
+	 * @param table_uuid
+	 * @param table_name
+	 * @param ls
+	 * @param pls 鐖剁晫闈�
+	 */
+	private void toConvertFace(String table_uuid,String table_name,List<FaceFieldEntity> ls,List<FaceFieldEntity> pls) {
+		if(ls==null) {
+			ls=new ArrayList<FaceFieldEntity>();
+		}
+		DataTableEntity dte = DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夊瓧娈典俊鎭苟鎸夎〃鍒嗙粍",new String[] {table_uuid});
+		for(int j=0;j<dte.getRows();j++) {
+			FaceFieldEntity uuid=new FaceFieldEntity();
+			FieldSetEntity f=dte.getFieldSetEntity(j);
+			if("pk".equals(f.getString("field_type")) 
+					||"updated_by".equals(f.getString("field_name"))
+					||"updated_utc_datetime".equals(f.getString("field_name"))) {
+				continue;
+			}
+			if("uuid".equals(f.getString("field_name"))) {
+				uuid.setHidden("1"); 
+			}
+			if("userids".equals(f.getString("field_type")) ||"orgUuids".equals(f.getString("field_type")) ) {
+				uuid.setMultiple("1");
+			}else {
+				uuid.setMultiple("0");
+			}
+				
+			uuid.setComponentType("");
+			uuid.setPrompt(f.getString("field_reference"));
+			uuid.setName(f.getString("field_show_name"));
+			uuid.setField(f.getString("field_name"));
+			uuid.setType(f.getString("field_type"));
+			uuid.setTable(table_name);
+			ls.add(uuid);
+		}
+		if(pls!=null) {
+			FaceFieldEntity uuid=new FaceFieldEntity();
+			uuid.setHidden(""); 
+			uuid.setComponentType("subTable");
+			uuid.setPrompt("");
+			uuid.setName("");
+			uuid.setField("");
+			uuid.setType("");
+			uuid.setSubField(ls);
+			uuid.setSubTableName(table_name);
+			pls.add(uuid);
+		}
+	}
+	
+	public List<FaceFieldEntity> getFaceFieldByTable(FieldSetEntity fse) {
+		String tableUuid = fse.getString("table_uuid");
+		String tableName = fse.getString("table_name");
+		if (StringUtils.isEmpty(tableUuid) && !StringUtils.isEmpty(tableName)) {
+			FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅", new String[]{tableName});
+			if (!FieldSetEntity.isEmpty(tableInfo)) {
+				tableUuid = tableInfo.getString("uuid");
+			}
+		}
+		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);
+		faceFse.setTableName(tableName);
+		return getFaceField(faceFse);
+	}
 
-	public List<FaceFieldEntity> getFaceField(FieldSetEntity fse) throws BaseException {
+
+	public List<FaceFieldEntity> getFlowFaceField(FieldSetEntity fse) throws BaseException {
 		String flowBusinessForm = flowDetailService.getFlowBusinessForm(fse);
 		JSONObject jsonObject = JSON.parseObject(flowBusinessForm);
 		JSONObject data = jsonObject.getJSONObject("data");
@@ -65,17 +256,31 @@
 			} while (false);
 
 		}
+		return getFaceField(faceFse);
+	}
 
+	private List<FaceFieldEntity> getFaceField(FieldSetEntity faceFse) {
 		if (FieldSetEntity.isEmpty(faceFse) || DataTableEntity.isEmpty(faceFse.getSubDataTable("product_sys_face_control_property"))) {
-			throw new BaseException(MobileCoreCode.GET_FACE_CONFIG_FAIL);
+			return null;
+//			throw new BaseException(MobileCoreCode.GET_FACE_CONFIG_FAIL);
 		}
 
 		DataTableEntity productSysFaceControlProperty = faceFse.getSubDataTable("product_sys_face_control_property");
 		List<FieldSetEntity> tagFieldSetEntityList = new ArrayList<>();
 		//鏍规嵁group_uuid 鍒嗙粍
 		Map<String, List<FieldSetEntity>> groupMap = new HashMap<>();
+		Map<String, List<FieldSetEntity>> parentMap = new HashMap<>();
 		for (FieldSetEntity fieldSetEntity : productSysFaceControlProperty.getData()) {
 			String groupUuid = fieldSetEntity.getString("group_uuid");
+			String parentUuid = fieldSetEntity.getString("parent_uuid");
+			if (!StringUtils.isEmpty(parentUuid)) {
+				List<FieldSetEntity> fieldSetEntities = parentMap.get(parentUuid);
+				if (fieldSetEntities == null) {
+					fieldSetEntities = new ArrayList<>();
+					parentMap.put(parentUuid, fieldSetEntities);
+				}
+				fieldSetEntities.add(fieldSetEntity);
+			}
 			if ("tag".equals(fieldSetEntity.getString("property_name"))) {
 				tagFieldSetEntityList.add(fieldSetEntity);
 			}
@@ -93,6 +298,7 @@
 		}
 
 		List<FaceFieldEntity> result = new ArrayList<>();
+		List<List<FieldSetEntity>> subTableField = new ArrayList<>();
 		for (FieldSetEntity fs : tagFieldSetEntityList) {
 			String groupUuid = fs.getString("group_uuid");
 			String parentUuid = fs.getString("parent_uuid");
@@ -103,45 +309,196 @@
 			if (CollectionUtil.isEmpty(fieldSetEntity)) {
 				continue;
 			}
-			FieldSetEntity parent = fieldSetEntity.get(0);
-			String groupUuid1 = parent.getString("group_uuid");
-			if (StringUtils.isEmpty(groupUuid1)) {
-				continue;
+
+			to(groupMap, fieldSetEntity, subTableField, result, parentMap);
+		}
+		if (!CollectionUtil.isEmpty(subTableField)) {
+			//鏍规嵁瀛愯〃琛ㄥ悕瑁呰浇
+			Map<String, FaceFieldEntity> tableByFaceField = new HashMap<>();
+			for (List<FieldSetEntity> fieldSetEntities : subTableField) {
+				String parentUuid = fieldSetEntities.get(0).getString("parent_uuid");
+				//鍏堟壘鍒癱hildren
+				List<FieldSetEntity> fieldSetEntity = productSysFaceControlProperty.getFieldSetEntity(parentUuid);
+				if (CollectionUtil.isEmpty(fieldSetEntities)) {
+					continue;
+				}
+				//鎵惧埌浜哻hildren
+				FieldSetEntity fieldSetEntity1 = fieldSetEntity.get(0);
+				String p = fieldSetEntity1.getString("parent_uuid");
+				String cGroupUuid = fieldSetEntity1.getString("group_uuid");
+				if (StringUtils.isEmpty(p) || StringUtils.isEmpty(cGroupUuid)) {
+					continue;
+				}
+				List<FieldSetEntity> childrenGroup = groupMap.get(cGroupUuid);
+				List<FieldSetEntity> fieldSetEntity2 = productSysFaceControlProperty.getFieldSetEntity(p);
+				if (CollectionUtil.isEmpty(fieldSetEntity2) || CollectionUtil.isEmpty(childrenGroup)) {
+					continue;
+				}
+				//鎵惧埌浜� __config__
+				FieldSetEntity fieldSetEntity3 = fieldSetEntity2.get(0);
+				String groupUuid = fieldSetEntity3.getString("group_uuid");
+				if (StringUtils.isEmpty(groupUuid)) {
+					continue;
+				}
+				String uuid = fieldSetEntity3.getUUID();
+
+				FaceFieldEntity faceFieldEntity = tableByFaceField.get(uuid);
+				if (faceFieldEntity == null) {
+					faceFieldEntity = new FaceFieldEntity();
+				}
+				faceFieldEntity.setComponentType("subTable");
+				boolean isSub = CollectionUtil.isNotEmpty(faceFieldEntity.getSubField());
+				if (!isSub) {
+					for (FieldSetEntity setEntity : childrenGroup) {
+						String propertyName = setEntity.getString("property_name");
+						if ("tag".equals(propertyName) && "lx-form-sub-table".equals(setEntity.getString("property_value"))) {
+							isSub = true;
+							break;
+						}
+					}
+				}
+				if (!isSub) {
+					//涓嶆槸瀛愯〃缁勪欢
+					continue;
+				}
+				for (FieldSetEntity setEntity : groupMap.get(groupUuid)) {
+					String propertyName = setEntity.getString("property_name");
+					if ("subTableName".equals(propertyName)) {
+						faceFieldEntity.setSubTableName(setEntity.getString("property_value"));
+						tableByFaceField.put(faceFieldEntity.getSubTableName(), faceFieldEntity);
+					} else if ("add".equals(propertyName)) {
+						faceFieldEntity.setAllowAdd(setEntity.getBoolean("property_value"));
+					} else if ("delete".equals(propertyName)) {
+						faceFieldEntity.setAllowDelete(setEntity.getBoolean("property_value"));
+					}
+				}
+				List<FaceFieldEntity> subFieldList = faceFieldEntity.getSubField();
+				if (CollectionUtil.isEmpty(subFieldList)) {
+					subFieldList = new ArrayList<>();
+					faceFieldEntity.setSubField(subFieldList);
+				}
+
+				for (List<FieldSetEntity> setEntities : subTableField) {
+					to(groupMap, setEntities, null, subFieldList, parentMap);
+				}
+				if (!tableByFaceField.containsKey(uuid)) {
+					tableByFaceField.put(uuid, faceFieldEntity);
+					result.add(faceFieldEntity);
+				}
+				break;
+
 			}
-			List<FieldSetEntity> parentGroup = groupMap.get(groupUuid1);
-			FaceFieldEntity faceFieldEntity = new FaceFieldEntity();
+		}
+		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, List<List<FieldSetEntity>> subTableField, List<FaceFieldEntity> result, Map<String, List<FieldSetEntity>> parentMap) {
+		FieldSetEntity parent = fieldSetEntity.get(0);
+		String groupUuid1 = parent.getString("group_uuid");
+		if (StringUtils.isEmpty(groupUuid1)) {
+			return;
+		}
+		List<FieldSetEntity> parentGroup = groupMap.get(groupUuid1);
+		FaceFieldEntity faceFieldEntity = new FaceFieldEntity();
+		String __config__ = null;
+		List<FieldSetEntity> other = null;
+		do {
 			for (FieldSetEntity setEntity : parentGroup) {
 				//鎵惧埌灞炴�у悕绉�= __vModel__
 				String propertyName = setEntity.getString("property_name");
+				if ("parentType".equals(propertyName) && "subTable".equals(setEntity.getString("property_value")) && subTableField != null) {
+					//瀛愯〃瀛楁
+					subTableField.add(parentGroup);
+					result.remove(faceFieldEntity);
+					break;
+				}
 				if ("__vModel__".equals(setEntity.getString("property_name"))) {
 					result.add(faceFieldEntity);
-					propertyName = "fieldName";
+					propertyName = "field";
+				} else if ("__config__".equals(propertyName)) {
+					__config__ = setEntity.getUUID();
+				}
+				if (!StringUtils.isAnyEmpty(__config__)) {
+					//璇诲彇瀛愯〃灞炴��
+					if (parentMap != null) {
+						other = parentMap.get(__config__);
+					}
 				}
 				propertyName = StrUtil.toCamelCase(propertyName);
 				if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName)) {
 					ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
-				}
-			}
-			List<FieldSetEntity> configGroup = groupMap.get(groupUuid);
-			for (FieldSetEntity setEntity : configGroup) {
-				//鎵惧埌灞炴�у悕绉�= __vModel__
-				String propertyName = setEntity.getString("property_name");
-				if ("tag".equals(propertyName)) {
-					result.add(faceFieldEntity);
-					propertyName = "component_type";
-				} else if ("field".equals(propertyName)) {
-					propertyName = "fileField";
-				} else if ("tableName".equals(propertyName)) {
-					propertyName = "fileTableName";
-				}
-				propertyName = StrUtil.toCamelCase(propertyName);
-				if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName)) {
-					ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
-				}
-			}
 
+				} else if (!StringUtils.isEmpty(setEntity.getObject("property_value"))) {
+					//鍒ゆ柇鏄惁
+					faceFieldEntity.putOtherParam(propertyName, setEntity.getObject("property_value"));
+				}
+			}
+			if (StringUtils.isEmpty(faceFieldEntity.getField())) {
+				return;
+			}
+			if (parentGroup == other) {
+				break;
+			}
+			if (other != null) {
+				parentGroup = other;
+				parentMap = null;
+			}
+		} while (other != null);
+		Set<FieldSetEntity> configGroup = Sets.newHashSet(groupMap.get(fieldSetEntity.get(0).getString("group_uuid")));
+		if (other != null) {
+			if (configGroup == null) {
+				configGroup = Sets.newHashSet(other);
+			} else {
+				configGroup.addAll(other);
+			}
+		}
+		parentGroup = groupMap.get(groupUuid1);
+		if (configGroup != null && parentGroup != null) {
+			configGroup.addAll(parentGroup);
 		}
 
-		return result;
+		for (FieldSetEntity setEntity : configGroup) {
+			//鎵惧埌灞炴�у悕绉�= __vModel__
+			String propertyName = setEntity.getString("property_name");
+			if ("tag".equals(propertyName)) {
+				propertyName = "component_type";
+			} else if ("field".equals(propertyName)) {
+				propertyName = "fileField";
+			} else if ("tableName".equals(propertyName)) {
+				propertyName = "fileTableName";
+			}
+			propertyName = StrUtil.toCamelCase(propertyName);
+			if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName)) {
+				ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
+			}
+		}
 	}
+
 }

--
Gitblit v1.9.2