parent
ac79690b5a
commit
a4c529d3ce
@ -616,8 +616,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
|
|||||||
// 为每个批次单独创建校验文件
|
// 为每个批次单独创建校验文件
|
||||||
String batchQualityCheckFilePath = generateObjectQualityCheckFilePath(objectApi + "_" + batch.getId());
|
String batchQualityCheckFilePath = generateObjectQualityCheckFilePath(objectApi + "_" + batch.getId());
|
||||||
try (ExcelWriter objectWriter = EasyExcel.write(batchQualityCheckFilePath).build()) {
|
try (ExcelWriter objectWriter = EasyExcel.write(batchQualityCheckFilePath).build()) {
|
||||||
WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject);
|
batchHasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, dataObject, sourceConn, targetConn, fieldMap, ignoreBeginDate) || batchHasError;
|
||||||
batchHasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap, ignoreBeginDate) || batchHasError;
|
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.error("API={},批次ID={}处理异常:{}",objectApi,batch.getId(), e.getMessage(),e);
|
log.error("API={},批次ID={}处理异常:{}",objectApi,batch.getId(), e.getMessage(),e);
|
||||||
}
|
}
|
||||||
@ -636,10 +635,9 @@ public class DataVerifyServiceImpl implements DataVerifyService {
|
|||||||
}else {
|
}else {
|
||||||
boolean hasError = false;
|
boolean hasError = false;
|
||||||
try (ExcelWriter objectWriter = EasyExcel.write(qualityCheckFilePath).build()) {
|
try (ExcelWriter objectWriter = EasyExcel.write(qualityCheckFilePath).build()) {
|
||||||
WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject);
|
|
||||||
|
|
||||||
for (DataBatch batch : batches) {
|
for (DataBatch batch : batches) {
|
||||||
hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet, detailSheet, sourceConn, targetConn, fieldMap, ignoreBeginDate) || hasError;
|
hasError = processDataBatch(batch, objectApi, fields, excelWriter, objectWriter, summarySheet,dataObject, sourceConn, targetConn, fieldMap, ignoreBeginDate) || hasError;
|
||||||
}
|
}
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.error("API={},处理异常:{}",objectApi, e.getMessage(),e);
|
log.error("API={},处理异常:{}",objectApi, e.getMessage(),e);
|
||||||
@ -751,8 +749,11 @@ public class DataVerifyServiceImpl implements DataVerifyService {
|
|||||||
* 处理单个数据批次
|
* 处理单个数据批次
|
||||||
*/
|
*/
|
||||||
private boolean processDataBatch(DataBatch batch, String objectApi, List<DataField> fields,
|
private boolean processDataBatch(DataBatch batch, String objectApi, List<DataField> fields,
|
||||||
ExcelWriter excelWriter,ExcelWriter objectWriter, WriteSheet summarySheet, WriteSheet detailSheet,
|
ExcelWriter excelWriter,ExcelWriter objectWriter, WriteSheet summarySheet, DataObject dataObject,
|
||||||
PartnerConnection sourceConn, PartnerConnection targetConn,Map<String, Map<String, Field>> fieldMap, Date ignoreBeginDate) {
|
PartnerConnection sourceConn, PartnerConnection targetConn,Map<String, Map<String, Field>> fieldMap, Date ignoreBeginDate) {
|
||||||
|
|
||||||
|
WriteSheet detailSheet = createDetailSheet(excelWriter, dataObject);
|
||||||
|
|
||||||
String startDate = DateFormatUtils.format(batch.getSyncStartDate(), "yyyy-MM-dd HH:mm:ss");
|
String startDate = DateFormatUtils.format(batch.getSyncStartDate(), "yyyy-MM-dd HH:mm:ss");
|
||||||
String endDate = DateFormatUtils.format(batch.getSyncEndDate(), "yyyy-MM-dd HH:mm:ss");
|
String endDate = DateFormatUtils.format(batch.getSyncEndDate(), "yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user