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

【feat】 异常修复

Browse Source 
(cherry picked from commit 32047b2287)
This commit is contained in:
Kris 2025-10-21 15:16:11 +08:00
parent 3e60887577
commit abb4753713
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/start.sh
View File

@ -5,7 +5,7 @@
#dbUsername="root" #dbUsername="root"
#dbPassword="celnet@2025.bln" #dbPassword="celnet@2025.bln"
#携科 #携科
dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false" dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai"
dbUsername="root" dbUsername="root"
dbPassword="Celnet2025.QY" dbPassword="Celnet2025.QY"
#其它 #其它

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

@ -245,11 +245,11 @@ public class CommonBatchServiceImpl implements CommonBatchService {
String line; String line;
int lineCount = 0; int lineCount = 0;
while ((line = bufferedReader.readLine()) != null) { while ((line = bufferedReader.readLine()) != null) {
// 保存第一行作为标题行，并替换CreatedDate和CreatedById为Original_Created_Date__c和Original_Created_By__c
// 但要确保不替换CreatedDate__c和CreatedById__c这样的自定义字段
line = line.replaceAll("(?<!__)CreatedDate(?!__)", "Original_Created_Date__c")
.replaceAll("(?<!__)CreatedById(?!__)", "Original_Created_By__c");
if (headerLine == null) { if (headerLine == null) {
// 保存第一行作为标题行，并替换CreatedDate和CreatedById为Original_Created_Date__c和Original_Created_By__c
// 但要确保不替换CreatedDate__c和CreatedById__c这样的自定义字段
line = line.replaceAll("(?<!__)CreatedDate(?!__)", "Original_Created_Date__c")
.replaceAll("(?<!__)CreatedById(?!__)", "Original_Created_By__c");
headerLine = line; headerLine = line;
} }
lineCount++; lineCount++;

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

@ -865,6 +865,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
for (DataField field : fields) { for (DataField field : fields) {
String fieldName = field.getField(); String fieldName = field.getField();
if (Const.EXCLUDE_FIELDS.contains(fieldName)) if (Const.EXCLUDE_FIELDS.contains(fieldName))
continue; // 跳过字段比较 continue; // 跳过字段比较
@ -886,7 +887,8 @@ public class DataVerifyServiceImpl implements DataVerifyService {
if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) { if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) {
if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){ String[] split = referenceTo.split(",");
if (split.length > 1 && !"User".equals(referenceTo)){
continue; continue;
} }
if (StringUtils.isBlank(referenceTo)){ if (StringUtils.isBlank(referenceTo)){
@ -894,6 +896,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
} }
Map<String, Object> objectMap = customMapper.getById("new_id", referenceTo, String.valueOf(sourceValue)); Map<String, Object> objectMap = customMapper.getById("new_id", referenceTo, String.valueOf(sourceValue));
if (objectMap == null || !String.valueOf(objectMap.get("new_id")).equals(String.valueOf(targetValue))) { if (objectMap == null || !String.valueOf(objectMap.get("new_id")).equals(String.valueOf(targetValue))) {
List<String> row = Lists.newArrayList(); List<String> row = Lists.newArrayList();
row.add(String.valueOf(batch.getId())); row.add(String.valueOf(batch.getId()));
@ -1357,7 +1360,8 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file
if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) { if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) {
if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){ String[] split = referenceTo.split(",");
if (split.length > 1 && !"User".equals(referenceTo)){
continue; continue;
} }
if (StringUtils.isBlank(referenceTo)){ if (StringUtils.isBlank(referenceTo)){