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 | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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..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,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.*;
/**
@@ -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,6 @@
if ("__vModel__".equals(setEntity.getString("property_name"))) {
result.add(faceFieldEntity);
propertyName = "field";
- } else if ("defaultNow".equals(propertyName)) {
- propertyName = "defaultValue";
} else if ("__config__".equals(propertyName)) {
__config__ = setEntity.getUUID();
}
@@ -425,11 +453,7 @@
}
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"));
- }
+ ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
} else if (!StringUtils.isEmpty(setEntity.getObject("property_value"))) {
//鍒ゆ柇鏄惁
@@ -475,7 +499,6 @@
ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
}
}
-
}
}
--
Gitblit v1.9.2