From 46578a69a1bf44cd34bd4d00e76ac3e876e530ed Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 17 十月 2024 09:58:00 +0800
Subject: [PATCH] 避免组件属性中自带的componentType覆盖tag
---
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 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 cfa138d..592931a 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -53,19 +53,19 @@
*/
public List<FaceFieldEntity> getFaceConfig(FieldSetEntity fse) {
- String tableUuid=fse.getString("table_uuid");
- if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("uuid"))
+ 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) {
+ if (detailFse != null) {
//鑾峰彇琛ㄥ悕
fse.setValue("table_name", detailFse.getString("table_name"));
}
}
//閫氳繃瀹℃壒浠诲姟鐨剈uid鏉ユ煡琛ㄥ崟淇℃伅
- if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("table_name"))) {
+ 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");
@@ -73,7 +73,7 @@
}
}
- if(tableUuid!=null && fse.getString("table_name")==null) {
+ if (tableUuid != null && fse.getString("table_name") == null) {
FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅(uuid)", new String[]{tableUuid});
if (!FieldSetEntity.isEmpty(tableInfo)) {
@@ -82,58 +82,59 @@
}
}
- List<FaceFieldEntity> ls=getFaceFieldByTable(fse);
- if(ls==null)ls=new ArrayList<FaceFieldEntity>();
- addproperty(tableUuid,fse.getString("table_name"),ls);
+ 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)) {///涓昏〃瀛楁
+ 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()});
+ , new String[]{table_uuid, ls.get(i).getField()});
- if(!DataTableEntity.isEmpty(dt)) {
+ 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()) &&
+ 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()) &&
+ 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()) &&
+ 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 {
+ } else {
//============鎶婂瓙琛ㄥ瓧娈典篃澶勭悊涓�涓�
//瀛愯〃
FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("鎵�鏈夎〃淇℃伅", new String[]{subTableName});
if (!FieldSetEntity.isEmpty(tableInfo)) {
- addproperty(tableInfo.getString("uuid"),tableInfo.getString("table_name"),ls.get(i).getSubField());
+ 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();
+ 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("缂� 鐮�");
@@ -143,18 +144,19 @@
ls.add(uuid);
}
- }else {///浠ヨ〃鍗曡璁′负鍑嗭紝濡傛灉娌℃湁閰嶇疆琛ㄥ崟锛屽垯浠ユ暟鎹〃涓哄噯锛屽叏閮ㄤ繚鐣�
- toConvertFace(table_uuid,table_name,ls,null);
+ } 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);
+ 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
@@ -162,25 +164,25 @@
* @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>();
+ 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"))) {
+ 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"))) {
+ if ("uuid".equals(f.getString("field_name"))) {
uuid.setHidden("1");
}
- if("userids".equals(f.getString("field_type")) ||"orgUuids".equals(f.getString("field_type")) ) {
+ if ("userids".equals(f.getString("field_type")) || "orgUuids".equals(f.getString("field_type"))) {
uuid.setMultiple("1");
- }else {
+ } else {
uuid.setMultiple("0");
}
@@ -192,8 +194,8 @@
uuid.setTable(table_name);
ls.add(uuid);
}
- if(pls!=null) {
- FaceFieldEntity uuid=new FaceFieldEntity();
+ if (pls != null) {
+ FaceFieldEntity uuid = new FaceFieldEntity();
uuid.setHidden("");
uuid.setComponentType("subTable");
uuid.setPrompt("");
@@ -433,6 +435,9 @@
for (FieldSetEntity setEntity : parentGroup) {
//鎵惧埌灞炴�у悕绉�= __vModel__
String propertyName = setEntity.getString("property_name");
+ if ("componentType".equals(propertyName)) {
+ continue;
+ }
if ("parentType".equals(propertyName) && "subTable".equals(setEntity.getString("property_value")) && subTableField != null) {
//瀛愯〃瀛楁
subTableField.add(parentGroup);
@@ -457,9 +462,6 @@
}
propertyName = StrUtil.toCamelCase(propertyName);
if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName) && !"field".equals(setEntity.getString("property_name")) && !"prompt".equals(setEntity.getString("property_name"))) {
- if("prompt".equals(propertyName)){
- System.out.println(1);
- }
ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
} else if (!StringUtils.isEmpty(setEntity.getObject("property_value"))) {
@@ -494,6 +496,9 @@
for (FieldSetEntity setEntity : configGroup) {
//鎵惧埌灞炴�у悕绉�= __vModel__
String propertyName = setEntity.getString("property_name");
+ if ("componentType".equals(propertyName)) {
+ continue;
+ }
if ("tag".equals(propertyName)) {
propertyName = "component_type";
} else if ("field".equals(propertyName)) {
--
Gitblit v1.9.2