kris/data-dump
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kris:84d6fbd4014361e16de97f56cdf73cbc1ae96e83
Branches Tags
kris:master
kris:develop_开发版
kris:develop_20251009_V2
kris:develop_20250826
kris:develop_百思_20250801
kris:develop_亚数_20250731
kris:develop_百思_20250729
kris:develop_携科
kris:develop
kris:master_back
...
compare: kris:44c851ce119e802698fc8f26c6b14853569cb3f4
Branches Tags
kris:develop_开发版
kris:develop_20251009_V2
kris:develop_20250826
kris:develop_百思_20250801
kris:develop_亚数_20250731
kris:develop_百思_20250729
kris:develop_携科
kris:develop
kris:master
kris:master_back

2 Commits
84d6fbd401 ... 44c851ce11

Author SHA1 Message Date
Kris
44c851ce11 【feat】 剔除质量校验多态字段 
(cherry picked from commit 59c4710f2e)
 2025-10-11 16:57:46 +08:00
Kris
a3f9ea6b10 【fix】 修复查询对象异常问题 
(cherry picked from commit a155736605)
 2025-10-11 16:57:36 +08:00
3 changed files with 25 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
src/main/java/com/celnet/datadump/service/impl/DataImportBatchServiceImpl.java
View File

@ -878,7 +878,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
continue;
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.put(field, m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@ -1336,7 +1336,7 @@ public class DataImportBatchServiceImpl implements DataImportBatchService {
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, data.get(j - 1).get(dataField.getField()).toString());
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.put(dataField.getField(), m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(dataField.getField()) +"异常！";

8
src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
View File

@ -863,7 +863,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
continue;
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.setField(field, m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@ -1080,7 +1080,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
continue;
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.setField(field, m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ map.get("Id") +"的引用对象:" + reference_to + "的数据:"+ map.get(field) +"异常！";
@ -3582,7 +3582,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
continue;
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.setField(field, m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"异常！";
@ -3817,7 +3817,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
continue;
}
Map<String, Object> m = customMapper.getById("new_id", reference_to, value);
if (!m.isEmpty() && m.get("new_id") != null) {
if (m!= null && !m.isEmpty() && m.get("new_id") != null) {
account.setField(field, m.get("new_id"));
}else {
message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"异常！";

28
src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
View File

@ -612,7 +612,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap) || hasError;
}
}catch (Exception e){
log.error("API={},处理异常：{}",objectApi, e.getMessage());
log.error("API={},处理异常：{}",objectApi, e.getMessage(),e);
}
if (sendEmail && hasError){
@ -849,11 +849,16 @@ public class DataVerifyServiceImpl implements DataVerifyService {
continue;
}
//判断reference_to内是否包含User字符串
String referenceTo = field.getReferenceTo();
if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) {
referenceTo = "User";
}
if (field.getSfType().equals("reference") && !field.getReferenceTo().equals("data_picklist")) {
//判断reference_to内是否包含User字符串
String referenceTo = field.getReferenceTo();
if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) {
referenceTo = "User";
if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){
continue;
}
if (StringUtils.isBlank(referenceTo)){
continue;
@ -1290,11 +1295,16 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file
continue;
}
//判断reference_to内是否包含User字符串
String referenceTo = field.getReferenceTo();
if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) {
referenceTo = "User";
}
if (field.getSfType().equals("reference") && !field.getReferenceTo().equals("data_picklist")) {
//判断reference_to内是否包含User字符串
String referenceTo = field.getReferenceTo();
if (field.getReferenceTo().contains(",User") || field.getReferenceTo().contains("User,")) {
referenceTo = "User";
if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){
continue;
}
if (StringUtils.isBlank(referenceTo)){
continue;