From d94ade5a7cee4d3067e4c3b05cbb2e3c9d2f68fd Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 08 十月 2024 15:45:38 +0800
Subject: [PATCH] 绑定字段bug
---
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 93 ++++++++++++++++++++++++++++++----------------
1 files changed, 60 insertions(+), 33 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 79a39a4..fe05088 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -1,6 +1,8 @@
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;
@@ -25,6 +27,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.File;
+import java.nio.charset.Charset;
import java.util.*;
/**
@@ -37,18 +41,18 @@
@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"))) {
@@ -58,7 +62,7 @@
//鑾峰彇琛ㄥ悕
fse.setValue("table_name", detailFse.getString("table_name"));
}
-
+
}
//閫氳繃瀹℃壒浠诲姟鐨剈uid鏉ユ煡琛ㄥ崟淇℃伅
if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("table_name"))) {
@@ -68,26 +72,26 @@
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 璁板綍鐨勬墍鏈夎〃锛屽搴旂殑琛ㄥ崟淇℃伅
*/
@@ -98,20 +102,20 @@
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()) &&
+ 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"));
}
@@ -125,7 +129,7 @@
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)) {
@@ -135,10 +139,10 @@
uuid.setName("缂� 鐮�");
uuid.setType("String");
uuid.setTable(table_name);
- uuid.setHidden("1");
+ uuid.setHidden("1");
ls.add(uuid);
}
-
+
}else {///浠ヨ〃鍗曡璁′负鍑嗭紝濡傛灉娌℃湁閰嶇疆琛ㄥ崟锛屽垯浠ユ暟鎹〃涓哄噯锛屽叏閮ㄤ繚鐣�
toConvertFace(table_uuid,table_name,ls,null);
//杩斿洖瀛愯〃
@@ -148,7 +152,7 @@
toConvertFace(sub[0][i].toString(),sub[1][i].toString(),new ArrayList<FaceFieldEntity>(),ls);
}
}
-
+
}
}
/**
@@ -166,20 +170,20 @@
for(int j=0;j<dte.getRows();j++) {
FaceFieldEntity uuid=new FaceFieldEntity();
FieldSetEntity f=dte.getFieldSetEntity(j);
- if("pk".equals(f.getString("field_type"))
+ 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");
+ 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"));
@@ -190,7 +194,7 @@
}
if(pls!=null) {
FaceFieldEntity uuid=new FaceFieldEntity();
- uuid.setHidden("");
+ uuid.setHidden("");
uuid.setComponentType("subTable");
uuid.setPrompt("");
uuid.setName("");
@@ -201,7 +205,7 @@
pls.add(uuid);
}
}
-
+
public List<FaceFieldEntity> getFaceFieldByTable(FieldSetEntity fse) {
String tableUuid = fse.getString("table_uuid");
String tableName = fse.getString("table_name");
@@ -214,7 +218,7 @@
if (StringUtils.isEmpty(tableUuid)) {
throw new BaseException(MobileCoreCode.SYSTEM_FORM_COUNT);
}
- FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=?", new Object[]{tableUuid}, true);
+ FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=2", new Object[]{tableUuid}, true);
faceFse.setTableName(tableName);
return getFaceField(faceFse);
}
@@ -388,6 +392,32 @@
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);
@@ -412,8 +442,10 @@
if ("__vModel__".equals(setEntity.getString("property_name"))) {
result.add(faceFieldEntity);
propertyName = "field";
- } else if ("defaultNow".equals(propertyName)) {
- propertyName = "defaultValue";
+ } else if ("label".equals(setEntity.getString("property_name"))) {
+ propertyName = "name";
+ } else if ("advanceName".equals(setEntity.getString("property_name"))) {
+ propertyName = "field";
} else if ("__config__".equals(propertyName)) {
__config__ = setEntity.getUUID();
}
@@ -424,12 +456,8 @@
}
}
propertyName = StrUtil.toCamelCase(propertyName);
- if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName)) {
- if ("defaultValue".equals(propertyName)) {
- ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getBoolean("property_value"));
- } else {
- ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
- }
+ if (ReflectUtil.hasField(FaceFieldEntity.class, propertyName) && !"field".equals(setEntity.getString("property_name"))) {
+ ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
} else if (!StringUtils.isEmpty(setEntity.getObject("property_value"))) {
//鍒ゆ柇鏄惁
@@ -475,7 +503,6 @@
ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
}
}
-
}
}
--
Gitblit v1.9.2