Commit 1bfb1ded authored by liqin's avatar liqin 💬

bug fixed

parent 7edea1ed
...@@ -312,9 +312,6 @@ public class FileUploadController extends BaseController { ...@@ -312,9 +312,6 @@ public class FileUploadController extends BaseController {
if (!existChineseAudio) { if (!existChineseAudio) {
return getFailResult("必须包含汉语音频"); return getFailResult("必须包含汉语音频");
} }
if (files.length > 5) {
return getFailResult("一种语言只能对应一个文件,只能上传包含5种语言的音频");
}
int successCount = 0; int successCount = 0;
int failureCount = 0; int failureCount = 0;
...@@ -437,10 +434,6 @@ public class FileUploadController extends BaseController { ...@@ -437,10 +434,6 @@ public class FileUploadController extends BaseController {
return getFailResult("目前仅支持" + String.join("、", VIDEO_TYPE) + "格式"); 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 videoContentName = null;
String text; String text;
LCSUtil strie = null; LCSUtil strie = null;
......
...@@ -66,12 +66,16 @@ public class VideoContentController extends BaseController { ...@@ -66,12 +66,16 @@ public class VideoContentController extends BaseController {
if (count > 0) { if (count > 0) {
return getFailResult("400", "名称已存在,请修改名称"); return getFailResult("400", "名称已存在,请修改名称");
} }
TUser user = getcurUser();
final List<String> videoFileIdList = videoContent.getVideoFileIdList(); final List<String> videoFileIdList = videoContent.getVideoFileIdList();
if (videoFileIdList == null || videoFileIdList.isEmpty()) { if (videoFileIdList == null || videoFileIdList.isEmpty()) {
return getFailResult("400", "视频文件必须上传"); 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.setAuditStatus(AuditStatusEnum.TBC.name());
videoContent.setPublished(false); videoContent.setPublished(false);
videoContent.setDeleted(false); videoContent.setDeleted(false);
...@@ -96,7 +100,7 @@ public class VideoContentController extends BaseController { ...@@ -96,7 +100,7 @@ public class VideoContentController extends BaseController {
final Audit audit = Audit.builder() final Audit audit = Audit.builder()
.content(videoContent.getName()) .content(videoContent.getName())
.name(videoContent.getName()) .name(videoContent.getName())
.userId(user.getId()) .userId(getcurUser().getId())
.refItemId(videoContent.getId()) .refItemId(videoContent.getId())
.type(AuditTypeEnum.VIDEO_CONTENT.name()) .type(AuditTypeEnum.VIDEO_CONTENT.name())
.operation(AuditOperationEnum.ADD.name()) .operation(AuditOperationEnum.ADD.name())
...@@ -124,6 +128,11 @@ public class VideoContentController extends BaseController { ...@@ -124,6 +128,11 @@ public class VideoContentController extends BaseController {
if (videoFileIdList == null || videoFileIdList.isEmpty()) { if (videoFileIdList == null || videoFileIdList.isEmpty()) {
return getFailResult("400", "视频文件必须上传"); 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) { for (String videoFileId : videoFileIdList) {
final Asset asset = this.assetService.getById(videoFileId); final Asset asset = this.assetService.getById(videoFileId);
if (!asset.getPublished()) { if (!asset.getPublished()) {
......
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