Commit bd61555c authored by wujipeng's avatar wujipeng
Browse files

画布文件上传解析优化

parent 9f7624dc
...@@ -120,6 +120,19 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -120,6 +120,19 @@ public class AnalysisServiceImpl implements AnalysisService {
.build()); .build());
} }
} }
if (StringUtils.isNotEmpty(folderName)) {
String userName = trimChineseNameFromFilename(folderName);
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder().userName(userName)
.age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.caseId(caseId)
.build());
}
}
if (errorCount == 0){ if (errorCount == 0){
return Result.data(fileUploadList); return Result.data(fileUploadList);
}else { }else {
...@@ -254,16 +267,6 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -254,16 +267,6 @@ public class AnalysisServiceImpl implements AnalysisService {
if (StringUtils.isNotEmpty(folderName)) { if (StringUtils.isNotEmpty(folderName)) {
String userName = trimChineseNameFromFilename(folderName); String userName = trimChineseNameFromFilename(folderName);
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder().userName(userName)
.age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.caseId(caseId)
.build());
}
if (!excelData.isEmpty()) { if (!excelData.isEmpty()) {
List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList()); List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList());
List<UserAccountEntity> userAccountList = Lists.newArrayList(); List<UserAccountEntity> userAccountList = Lists.newArrayList();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment