Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
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
liqin
chnmuseum-party
Commits
1bfb1ded
Commit
1bfb1ded
authored
Apr 26, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
7edea1ed
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
FileUploadController.java
.../chnmuseum/party/web/controller/FileUploadController.java
+0
-7
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+12
-3
No files found.
src/main/java/cn/chnmuseum/party/web/controller/FileUploadController.java
View file @
1bfb1ded
...
...
@@ -312,9 +312,6 @@ public class FileUploadController extends BaseController {
if
(!
existChineseAudio
)
{
return
getFailResult
(
"必须包含汉语音频"
);
}
if
(
files
.
length
>
5
)
{
return
getFailResult
(
"一种语言只能对应一个文件,只能上传包含5种语言的音频"
);
}
int
successCount
=
0
;
int
failureCount
=
0
;
...
...
@@ -437,10 +434,6 @@ public class FileUploadController extends BaseController {
return
getFailResult
(
"目前仅支持"
+
String
.
join
(
"、"
,
VIDEO_TYPE
)
+
"格式"
);
}
}
final
boolean
matchChinese
=
Arrays
.
stream
(
files
).
anyMatch
(
s
->
Objects
.
requireNonNull
(
s
.
getOriginalFilename
()).
contains
(
"汉语"
));
if
(!
matchChinese
)
{
return
getFailResult
(
"文件必须包含汉语视频"
);
}
String
videoContentName
=
null
;
String
text
;
LCSUtil
strie
=
null
;
...
...
src/main/java/cn/chnmuseum/party/web/controller/VideoContentController.java
View file @
1bfb1ded
...
...
@@ -66,12 +66,16 @@ public class VideoContentController extends BaseController {
if
(
count
>
0
)
{
return
getFailResult
(
"400"
,
"名称已存在,请修改名称"
);
}
TUser
user
=
getcurUser
();
final
List
<
String
>
videoFileIdList
=
videoContent
.
getVideoFileIdList
();
if
(
videoFileIdList
==
null
||
videoFileIdList
.
isEmpty
())
{
return
getFailResult
(
"400"
,
"视频文件必须上传"
);
}
final
List
<
Asset
>
assetList
=
this
.
assetService
.
listByIds
(
videoFileIdList
);
final
List
<
String
>
languageList
=
assetList
.
stream
().
map
(
Asset:
:
getLanguage
).
collect
(
Collectors
.
toList
());
if
(!
languageList
.
contains
(
LanguageEnum
.
ZH
.
name
()))
{
return
getFailResult
(
"视频文件必须包含汉语"
);
}
videoContent
.
setAuditStatus
(
AuditStatusEnum
.
TBC
.
name
());
videoContent
.
setPublished
(
false
);
videoContent
.
setDeleted
(
false
);
...
...
@@ -96,7 +100,7 @@ public class VideoContentController extends BaseController {
final
Audit
audit
=
Audit
.
builder
()
.
content
(
videoContent
.
getName
())
.
name
(
videoContent
.
getName
())
.
userId
(
user
.
getId
())
.
userId
(
getcurUser
()
.
getId
())
.
refItemId
(
videoContent
.
getId
())
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
ADD
.
name
())
...
...
@@ -124,6 +128,11 @@ public class VideoContentController extends BaseController {
if
(
videoFileIdList
==
null
||
videoFileIdList
.
isEmpty
())
{
return
getFailResult
(
"400"
,
"视频文件必须上传"
);
}
final
List
<
Asset
>
assetList
=
this
.
assetService
.
listByIds
(
videoFileIdList
);
final
List
<
String
>
languageList
=
assetList
.
stream
().
map
(
Asset:
:
getLanguage
).
collect
(
Collectors
.
toList
());
if
(!
languageList
.
contains
(
LanguageEnum
.
ZH
.
name
()))
{
return
getFailResult
(
"视频文件必须包含汉语"
);
}
for
(
String
videoFileId
:
videoFileIdList
)
{
final
Asset
asset
=
this
.
assetService
.
getById
(
videoFileId
);
if
(!
asset
.
getPublished
())
{
...
...
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