Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
598bbf51
Commit
598bbf51
authored
Sep 09, 2025
by
wujipeng
Browse files
优化
parent
81020ede
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/com/platform/service/impl/AnalysisServiceImpl.java
View file @
598bbf51
...
...
@@ -232,11 +232,11 @@ public class AnalysisServiceImpl implements AnalysisService {
Map
<
String
,
String
>
idCardInfo
=
IdCardUtils
.
parseIdCardInfo
(
folderName
);
//删除旧用户
userService
.
remove
(
new
LambdaQueryWrapper
<
UserEntity
>()
.
eq
(
UserEntity:
:
getUserName
,
folderName
)
.
eq
(
UserEntity:
:
getUserName
,
trimChineseNameFromFilename
(
folderName
)
)
.
eq
(
UserEntity:
:
getCaseId
,
caseId
));
if
(!
ObjectUtils
.
isEmpty
(
idCardInfo
))
{
userService
.
save
(
UserEntity
.
builder
()
.
userName
(
folderName
)
.
userName
(
trimChineseNameFromFilename
(
folderName
)
)
.
age
(
Integer
.
parseInt
(
idCardInfo
.
get
(
"age"
)))
.
idCard
(
idCardInfo
.
get
(
"idCard"
))
.
sex
(
idCardInfo
.
get
(
"sex"
))
...
...
@@ -245,7 +245,7 @@ public class AnalysisServiceImpl implements AnalysisService {
.
caseId
(
caseId
).
build
());
}
else
{
userService
.
save
(
UserEntity
.
builder
()
.
userName
(
folderName
)
.
userName
(
trimChineseNameFromFilename
(
folderName
)
)
.
type
(
"1"
)
.
caseId
(
caseId
).
build
());
}
...
...
@@ -340,20 +340,19 @@ public class AnalysisServiceImpl implements AnalysisService {
trySetValue
(()
->
excelDataEntity
.
setExternalChannel
(
getCellValueAsString
(
row
.
getCell
(
tableHeaderList
.
get
(
14
).
getIndex
()))));
trySetValue
(()
->
excelDataEntity
.
setPayAccount
(
getCellValueAsString
(
row
.
getCell
(
tableHeaderList
.
get
(
15
).
getIndex
()))));
trySetValue
(()
->
excelDataEntity
.
setRemark
(
getCellValueAsString
(
row
.
getCell
(
tableHeaderList
.
get
(
16
).
getIndex
()))));
// if (StringUtils.isNotEmpty(folderName)) {
// Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
// if (!ObjectUtils.isEmpty(idCardInfo)) {
// //切割文件名前面是中文的人名,使用正则表达式
// trySetValue(() -> excelDataEntity.setPayUserName(trimChineseNameFromFilename(folderName) + idCardInfo.get("idCard")));
// }
// }
trySetValue
(()
->
excelDataEntity
.
setPayUserName
(
folderName
));
if
(
StringUtils
.
isNotEmpty
(
folderName
))
{
trySetValue
(()
->
excelDataEntity
.
setPayUserName
(
trimChineseNameFromFilename
(
folderName
)));
}
excelDataEntity
.
setFileId
(
fileId
);
excelDataEntity
.
setUseFlag
(
true
);
excelDataEntity
.
setCaseId
(
caseId
);
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
)
{
// 正则表达式匹配连续的中文字符
Pattern
pattern
=
Pattern
.
compile
(
"[\u4e00-\u9fa5]+"
);
...
...
src/main/java/com/platform/service/impl/UserServiceImpl.java
View file @
598bbf51
...
...
@@ -185,7 +185,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
List
<
UserAccountEntity
>
userAccountEntityList
=
userDTO
.
getUserAccountList
();
if
(
CollUtil
.
isNotEmpty
(
userAccountEntityList
))
{
userAccountEntityList
.
forEach
(
userAccountEntity
->
userAccountEntity
.
setUserName
(
userDTO
.
getUserName
()));
userAccountService
.
u
pdateBatch
ById
(
userAccountEntityList
);
userAccountService
.
saveOrU
pdateBatch
(
userAccountEntityList
);
}
return
Boolean
.
TRUE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment