Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tagManager
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanmw
tagManager
Commits
0b3865fc
Commit
0b3865fc
authored
Mar 12, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改标签导入逻辑
parent
c306c418
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
TagFileService.java
...java/com/keymobile/tagmanager/service/TagFileService.java
+9
-0
No files found.
src/main/java/com/keymobile/tagmanager/service/TagFileService.java
View file @
0b3865fc
...
...
@@ -439,8 +439,11 @@ public class TagFileService {
ExcelImportResult
<
Tag
>
excelImportResult
=
ExcelImportUtil
.
importExcelMore
(
file
.
getInputStream
(),
Tag
.
class
,
params
);
List
<
String
>
successIds
=
new
ArrayList
<>();
List
<
Tag
>
tags
=
excelImportResult
.
getList
();
//author:zhangkb time:2020-3-12 desc:excel解析到的标签路径'\'改成逗号
tags
.
forEach
(
tag
->
{
tag
.
setId
(
UUID
.
randomUUID
().
toString
());
String
tagPath
=
tag
.
getPath
().
replace
(
'\\'
,
','
);
tag
.
setPath
(
tagPath
);
pathTags
.
put
(
tag
.
getPath
(),
tag
);
});
...
...
@@ -507,6 +510,12 @@ public class TagFileService {
}
@Override
public
ExcelVerifyHandlerResult
verifyHandler
(
Tag
t
)
{
//author:zhangkb time:2020-3-12 desc:校验的标签路径'/'改成逗号
String
tagPath
=
t
.
getPath
();
if
(
StringUtils
.
isNotBlank
(
tagPath
))
{
tagPath
=
tagPath
.
replace
(
'\\'
,
','
);
t
.
setPath
(
tagPath
);
}
ExcelVerifyHandlerResult
result
=
new
ExcelVerifyHandlerResult
(
true
);
if
(!
Constants
.
TAG_SYSTEM_TYPE
.
equals
(
t
.
getTagType
())
&&
!
Constants
.
TAG_PERSONAL_TYPE
.
equals
(
t
.
getTagType
()))
{
...
...
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