bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

@@ -56,9 +56,9 @@ public class Audit implements Serializable {
     @NotBlank(message = "提交人员不能为空", groups = {Add.class})
     private String userId;
 
-    @ApiModelProperty(value = "审核内容", allowableValues = "ASSET,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT")
+    @ApiModelProperty(value = "审核内容", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT")
     @TableField("type")
-    @NotBlank(message = "0,看板；1 视频；2 学习内容；3 账号禁用不能为空", groups = {Add.class})
+    @NotBlank(message = "0,看板；1 视频内容；2 学习内容；3 账号禁用不能为空", groups = {Add.class})
     private String type;
 
     @ApiModelProperty("操作类型")

src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwnerVideoContentCat.java

@@ -30,7 +30,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("copyright_owner_video_content_cat")
-@ApiModel(value = "版权方视频分类", description = "版权方视频分类")
+@ApiModel(value = "版权方视频内容分类", description = "版权方视频内容分类")
 public class CopyrightOwnerVideoContentCat implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,7 +50,4 @@ public class CopyrightOwnerVideoContentCat implements Serializable {
     @NotBlank(message = "视频内容分类ID不能为空", groups = {Add.class, Update.class})
     private String videoContentCatId;
 
-
-
-
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java

@@ -72,9 +72,9 @@ public class ExhibitionBoard implements Serializable {
     @NotBlank(message = "视频内容版权方ID不能为空", groups = {Add.class, Update.class})
     private String videoContentCopyrightOwnerId;
 
-    @ApiModelProperty("视频类别ID")
+    @ApiModelProperty("视频内容类别ID")
     @TableField("video_content_cat_id")
-    @NotBlank(message = "视频类别ID不能为空", groups = {Add.class, Update.class})
+    @NotBlank(message = "视频内容类别ID不能为空", groups = {Add.class, Update.class})
     private String videoContentCatId;
 
     @ApiModelProperty("视频内容ID")

src/main/java/cn/wisenergy/chnmuseum/party/model/VideoContent.java

@@ -85,9 +85,9 @@ public class VideoContent implements Serializable {
     @TableField(exist = false)
     private String videoContentCopyrightOwnerName;
 
-    @ApiModelProperty("视频ID列表(添加/更新使用)")
+    @ApiModelProperty("视频文件ID列表(添加/更新使用)")
     @TableField(exist = false)
-    private List<String> videoIdList;
+    private List<String> videoFileIdList;
 
     @ApiModelProperty("视频文件信息列表")
     @TableField(exist = false)

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentController.java

@@ -55,8 +55,8 @@ public class VideoContentController extends BaseController {
     @RequiresPermissions("video:content:save")
     @ApiOperation(value = "添加视频内容", notes = "添加视频内容")
     public Map<String, Object> saveAsset(@Validated(value = {Add.class}) VideoContent videoContent) {
-        final List<String> videoIdList = videoContent.getVideoIdList();
-        if (videoIdList == null || videoIdList.isEmpty()) {
+        final List<String> videoFileIdList = videoContent.getVideoFileIdList();
+        if (videoFileIdList == null || videoFileIdList.isEmpty()) {
             return getFailResult("400", "视频文件必须上传");
         }
         videoContent.setAuditStatus(AuditStatusEnum.TBC.name());
@@ -66,8 +66,8 @@ public class VideoContentController extends BaseController {
         boolean result = videoContentService.save(videoContent);
         // 返回操作结果
         if (result) {
-            for (String videoId : videoIdList) {
-                final Asset asset = this.assetService.getById(videoId);
+            for (String videoFileId : videoFileIdList) {
+                final Asset asset = this.assetService.getById(videoFileId);
                 asset.setThumbnail(videoContent.getThumbnail());
                 asset.setFileType(FileTypeEnum.VIDEO.name());
                 asset.setFileCat(FileCatEnum.VIDEO_CONTENT.name());
@@ -96,19 +96,19 @@ public class VideoContentController extends BaseController {
         videoContent.setDeleted(false);
         boolean flag = videoContentService.updateById(videoContent);
         if (flag) {
-            final List<String> videoIdList = videoContent.getVideoIdList();
-            if (videoIdList != null && !videoIdList.isEmpty()) {
+            final List<String> videoFileIdList = videoContent.getVideoFileIdList();
+            if (videoFileIdList != null && !videoFileIdList.isEmpty()) {
                 final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContent.getId());
                 final List<Asset> assetList = this.assetService.list(assetQueryWrapper);
                 final Map<String, String> collect = assetList.stream().collect(Collectors.toMap(Asset::getId, Asset::getFileUrl));
-                for (String videoId : videoIdList) {
-                    final Asset asset = this.assetService.getById(videoId);
+                for (String videoFileId : videoFileIdList) {
+                    final Asset asset = this.assetService.getById(videoFileId);
                     asset.setThumbnail(videoContent.getThumbnail());
                     asset.setFileType(FileTypeEnum.VIDEO.name());
                     asset.setFileCat(FileCatEnum.VIDEO_CONTENT.name());
                     asset.setRefItemId(videoContent.getId());
                     this.assetService.updateById(asset);
-                    collect.remove(videoId);
+                    collect.remove(videoFileId);
                 }
                 collect.forEach((k, v) -> {
                     final boolean deleted = this.assetService.removeById(k);