Commit 598bbf51 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 81020ede
...@@ -232,11 +232,11 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -232,11 +232,11 @@ public class AnalysisServiceImpl implements AnalysisService {
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName); Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
//删除旧用户 //删除旧用户
userService.remove(new LambdaQueryWrapper<UserEntity>() userService.remove(new LambdaQueryWrapper<UserEntity>()
.eq(UserEntity::getUserName, folderName) .eq(UserEntity::getUserName, trimChineseNameFromFilename(folderName))
.eq(UserEntity::getCaseId, caseId)); .eq(UserEntity::getCaseId, caseId));
if (!ObjectUtils.isEmpty(idCardInfo)) { if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder() userService.save(UserEntity.builder()
.userName(folderName) .userName(trimChineseNameFromFilename(folderName))
.age(Integer.parseInt(idCardInfo.get("age"))) .age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard")) .idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex")) .sex(idCardInfo.get("sex"))
...@@ -245,7 +245,7 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -245,7 +245,7 @@ public class AnalysisServiceImpl implements AnalysisService {
.caseId(caseId).build()); .caseId(caseId).build());
} else { } else {
userService.save(UserEntity.builder() userService.save(UserEntity.builder()
.userName(folderName) .userName(trimChineseNameFromFilename(folderName))
.type("1") .type("1")
.caseId(caseId).build()); .caseId(caseId).build());
} }
...@@ -340,20 +340,19 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -340,20 +340,19 @@ public class AnalysisServiceImpl implements AnalysisService {
trySetValue(() -> excelDataEntity.setExternalChannel(getCellValueAsString(row.getCell(tableHeaderList.get(14).getIndex())))); trySetValue(() -> excelDataEntity.setExternalChannel(getCellValueAsString(row.getCell(tableHeaderList.get(14).getIndex()))));
trySetValue(() -> excelDataEntity.setPayAccount(getCellValueAsString(row.getCell(tableHeaderList.get(15).getIndex())))); trySetValue(() -> excelDataEntity.setPayAccount(getCellValueAsString(row.getCell(tableHeaderList.get(15).getIndex()))));
trySetValue(() -> excelDataEntity.setRemark(getCellValueAsString(row.getCell(tableHeaderList.get(16).getIndex())))); trySetValue(() -> excelDataEntity.setRemark(getCellValueAsString(row.getCell(tableHeaderList.get(16).getIndex()))));
// if (StringUtils.isNotEmpty(folderName)) { if (StringUtils.isNotEmpty(folderName)) {
// Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName); trySetValue(() -> excelDataEntity.setPayUserName(trimChineseNameFromFilename(folderName)));
// if (!ObjectUtils.isEmpty(idCardInfo)) { }
// //切割文件名前面是中文的人名,使用正则表达式
// trySetValue(() -> excelDataEntity.setPayUserName(trimChineseNameFromFilename(folderName) + idCardInfo.get("idCard")));
// }
// }
trySetValue(() -> excelDataEntity.setPayUserName(folderName));
excelDataEntity.setFileId(fileId); excelDataEntity.setFileId(fileId);
excelDataEntity.setUseFlag(true); excelDataEntity.setUseFlag(true);
excelDataEntity.setCaseId(caseId); excelDataEntity.setCaseId(caseId);
return excelDataEntity; return excelDataEntity;
} }
public static void main(String[] args) {
System.out.println(trimChineseNameFromFilename("张三-05_2023-07-05_2023-07-05_2023-07-05_2023-07-0"));
}
public static String trimChineseNameFromFilename(String filename) { public static String trimChineseNameFromFilename(String filename) {
// 正则表达式匹配连续的中文字符 // 正则表达式匹配连续的中文字符
Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]+"); Pattern pattern = Pattern.compile("[\u4e00-\u9fa5]+");
......
...@@ -185,7 +185,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -185,7 +185,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
List<UserAccountEntity> userAccountEntityList = userDTO.getUserAccountList(); List<UserAccountEntity> userAccountEntityList = userDTO.getUserAccountList();
if (CollUtil.isNotEmpty(userAccountEntityList)) { if (CollUtil.isNotEmpty(userAccountEntityList)) {
userAccountEntityList.forEach(userAccountEntity -> userAccountEntity.setUserName(userDTO.getUserName())); userAccountEntityList.forEach(userAccountEntity -> userAccountEntity.setUserName(userDTO.getUserName()));
userAccountService.updateBatchById(userAccountEntityList); userAccountService.saveOrUpdateBatch(userAccountEntityList);
} }
return Boolean.TRUE; return Boolean.TRUE;
} }
......
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