|
|
@ -46,13 +46,15 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang |
|
|
|
private CoverageService coverageService; |
|
|
|
private AgencyInfoCache agencyInfo; |
|
|
|
private IcDangerousChemicalsDao icDangerousChemicalsDao; |
|
|
|
private String currentUserId; |
|
|
|
|
|
|
|
private List<DangerousChemicalsModel.RowRemarkMessage> errorRows = new ArrayList<>(); |
|
|
|
private List<DangerousChemicalsModel.RowRemarkMessage> otherRows = new ArrayList<>(); |
|
|
|
private List<IcDangerousChemicalsEntity> insertList = new ArrayList<>(); |
|
|
|
private Map<String,String> existMap = null; |
|
|
|
|
|
|
|
public DangerousChemicalsImportListener(AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){ |
|
|
|
public DangerousChemicalsImportListener(String currentUserId, AgencyInfoCache agencyInfo, IcDangerousChemicalsService icDangerousChemicalsService, CoverageService coverageService, EpmetAdminOpenFeignClient adminOpenFeignClient, IcDangerousChemicalsDao icDangerousChemicalsDao){ |
|
|
|
this.currentUserId = currentUserId; |
|
|
|
this.agencyInfo = agencyInfo; |
|
|
|
this.icDangerousChemicalsService = icDangerousChemicalsService; |
|
|
|
this.coverageService = coverageService; |
|
|
@ -65,19 +67,21 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang |
|
|
|
Integer rowNum = context.readRowHolder().getRowIndex() + NumConstant.ONE; |
|
|
|
data.setRowNum(rowNum); |
|
|
|
try { |
|
|
|
existMap = null == existMap ? getExistMap(agencyInfo.getId()) : existMap; |
|
|
|
ValidatorUtils.validateEntity(data); |
|
|
|
/*existMap = null == existMap ? getExistMap(agencyInfo.getId()) : existMap; |
|
|
|
if (StringUtils.isNotBlank(existMap.get(data.getName()))){ |
|
|
|
DangerousChemicalsModel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(data, DangerousChemicalsModel.RowRemarkMessage.class); |
|
|
|
errorRow.setErrorInfo("数据库存在该条数据"); |
|
|
|
errorRows.add(errorRow); |
|
|
|
return; |
|
|
|
} |
|
|
|
}*/ |
|
|
|
IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class); |
|
|
|
e.setSourceType("import"); |
|
|
|
e.setAgencyId(agencyInfo.getId()); |
|
|
|
e.setCustomerId(agencyInfo.getCustomerId()); |
|
|
|
e.setAgencyIdPath(agencyInfo.getPids().equals(NumConstant.ZERO_STR) || agencyInfo.getPids().equals("") ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId())); |
|
|
|
e.setCreatedBy(currentUserId); |
|
|
|
e.setUpdatedBy(currentUserId); |
|
|
|
insertList.add(e); |
|
|
|
if (insertList.size() == NumConstant.ONE_HUNDRED){ |
|
|
|
execPersist(); |
|
|
@ -157,7 +161,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang |
|
|
|
}); |
|
|
|
} |
|
|
|
if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){ |
|
|
|
icDangerousChemicalsService.insertBatch(groupByStatus.get(false)); |
|
|
|
icDangerousChemicalsService.importInsert(groupByStatus.get(false)); |
|
|
|
} |
|
|
|
} |
|
|
|
} finally { |
|
|
|