bug fixed

src/main/java/cn/chnmuseum/party/web/controller/AssetController.java

@@ -72,6 +72,7 @@ public class AssetController extends BaseController {
                                                 @RequestParam(value = "videoContentCatId", required = false) String videoContentCatId,
                                                 @RequestParam(value = "videoContentCopyrightOwnerId", required = false) String videoContentCopyrightOwnerId) {
         LambdaQueryWrapper<Asset> ew = new LambdaQueryWrapper<>();
+        ew.eq(Asset::getPublished, true);
         // 对名称或编码模糊查询
         if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
             ew.like(Asset::getFileName, genericPageParam.getNameOrCode());

src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -30,8 +30,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.DisabledAccountException;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
@@ -50,8 +48,6 @@ import java.util.stream.Collectors;
 @Api(tags = {"中国移动API"})
 public class ChinaMobileRestApiController extends BaseController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ChinaMobileRestApiController.class);
-
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
@@ -354,7 +350,7 @@ public class ChinaMobileRestApiController extends BaseController {
             List<Map<String, String>> videoList = new ArrayList<>();
             final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
             final String videoContentId = exhibitionBoard.getVideoContentId();
-            LambdaQueryWrapper<Asset> assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+            LambdaQueryWrapper<Asset> assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true);;
             List<Asset> assetList = this.assetService.list(assetLambdaQueryWrapper);
             List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
             for (LanguageEnum languageEnum : LanguageEnum.values()) {
@@ -370,6 +366,7 @@ public class ChinaMobileRestApiController extends BaseController {
             assetLambdaQueryWrapper.clear();
             List<Map<String, String>> audioList = new ArrayList<>();
             assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, boardId);
+            assetLambdaQueryWrapper.eq(Asset::getPublished, true);
             assetLambdaQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO);
             assetList = this.assetService.list(assetLambdaQueryWrapper);
             languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
@@ -422,11 +419,13 @@ public class ChinaMobileRestApiController extends BaseController {
                 }
             }
             LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getVideoContentId());
+            assetQueryWrapper.eq(Asset::getPublished, true);
             assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
             List<Asset> videoList = this.assetService.list(assetQueryWrapper);
 
             assetQueryWrapper.clear();
             assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+            assetQueryWrapper.eq(Asset::getPublished, true);
             assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
             List<Asset> datumList = this.assetService.list(assetQueryWrapper);
             exhibitionBoard.setDatumList(datumList);
@@ -467,6 +466,7 @@ public class ChinaMobileRestApiController extends BaseController {
         }
 
         LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
+        assetQueryWrapper.eq(Asset::getPublished, true);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
         if (audioLanguage != null) {
             assetQueryWrapper.eq(Asset::getLanguage, audioLanguage.name());
@@ -476,6 +476,7 @@ public class ChinaMobileRestApiController extends BaseController {
 
         assetQueryWrapper.clear();
         assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
+        assetQueryWrapper.eq(Asset::getPublished, true);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
         final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
         exhibitionBoard.setDatumList(datumList);
@@ -487,6 +488,7 @@ public class ChinaMobileRestApiController extends BaseController {
 
             assetQueryWrapper.clear();
             assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+            assetQueryWrapper.eq(Asset::getPublished, true);
             assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
             if (videoLanguage != null) {
                 assetQueryWrapper.eq(Asset::getLanguage, videoLanguage.name());
@@ -628,6 +630,7 @@ public class ChinaMobileRestApiController extends BaseController {
     public Map<String, Object> getBoardRefMaterial(@PathVariable(value = "boardId") String boardId) {
         final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
         final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+        assetQueryWrapper.eq(Asset::getPublished, true);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
         final Page<Asset> datumList = this.assetService.page(this.getPage(), assetQueryWrapper);
         return getResult(datumList);

src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -194,7 +194,7 @@ public class ExhibitionBoardController extends BaseController {
                     exhibitionBoard.setVideoList(Collections.emptyList());
                 } else {
                     exhibitionBoard.setVideoContentName(videoContent.getName());
-                    final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId));
+                    final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true));
                     exhibitionBoard.setVideoList(videoList);
                 }
             }
@@ -283,7 +283,7 @@ public class ExhibitionBoardController extends BaseController {
                     exhibitionBoard.setVideoContentName("对应的视频内容已被删除");
                 } else {
                     exhibitionBoard.setVideoContentName(videoContent.getName());
-                    final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId));
+                    final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true));
                     exhibitionBoard.setVideoList(videoList);
                 }
             }
@@ -320,7 +320,7 @@ public class ExhibitionBoardController extends BaseController {
         exhibitionBoard.setAudioIdList(audioList.stream().map(Asset::getId).collect(Collectors.toList()));
 
         assetQueryWrapper.clear();
-        assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+        assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId()).eq(Asset::getPublished, true);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
         final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
         exhibitionBoard.setDatumList(datumList);
@@ -345,7 +345,7 @@ public class ExhibitionBoardController extends BaseController {
             exhibitionBoard.setVideoContentName(videoContent.getName());
 
             assetQueryWrapper.clear();
-            assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+            assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getPublished, true);
             assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
             final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
             exhibitionBoard.setVideoList(videoList);
@@ -376,6 +376,7 @@ public class ExhibitionBoardController extends BaseController {
         }
 
         LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+        assetQueryWrapper.eq(Asset::getPublished, false);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
         final List<Asset> audioList = this.assetService.list(assetQueryWrapper);
         if (audioList != null && !audioList.isEmpty()) {
@@ -385,6 +386,7 @@ public class ExhibitionBoardController extends BaseController {
 
         assetQueryWrapper.clear();
         assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+        assetQueryWrapper.eq(Asset::getPublished, false);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
         final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
         if (datumList != null && !datumList.isEmpty()) {
@@ -415,6 +417,7 @@ public class ExhibitionBoardController extends BaseController {
             }
             final LambdaQueryWrapper<Asset> lambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
             lambdaQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
+            assetQueryWrapper.eq(Asset::getPublished, false);
             final List<Asset> videoList = this.assetService.list(lambdaQueryWrapper);
             exhibitionBoard.setVideoList(videoList);
         }

src/main/java/cn/chnmuseum/party/web/controller/LearningContentController.java

@@ -330,12 +330,14 @@ public class LearningContentController extends BaseController {
                 }
 
                 LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+                assetQueryWrapper.eq(Asset::getPublished, true);
                 assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
                 final List<Asset> audioList = this.assetService.list(assetQueryWrapper);
                 exhibitionBoard.setAudioList(audioList);
 
                 assetQueryWrapper.clear();
                 assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+                assetQueryWrapper.eq(Asset::getPublished, true);
                 assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
                 final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
                 exhibitionBoard.setDatumList(datumList);
@@ -346,6 +348,7 @@ public class LearningContentController extends BaseController {
                     if (videoContent != null) {
                         assetQueryWrapper.clear();
                         assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+                        assetQueryWrapper.eq(Asset::getPublished, true);
                         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
                         final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
                         exhibitionBoard.setVideoList(videoList);
@@ -433,12 +436,14 @@ public class LearningContentController extends BaseController {
                 }
 
                 LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+                assetQueryWrapper.eq(Asset::getPublished, false);
                 assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
                 final List<Asset> audioList = this.assetService.list(assetQueryWrapper);
                 exhibitionBoard.setAudioList(audioList);
 
                 assetQueryWrapper.clear();
                 assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
+                assetQueryWrapper.eq(Asset::getPublished, false);
                 assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
                 final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
                 exhibitionBoard.setDatumList(datumList);
@@ -449,6 +454,7 @@ public class LearningContentController extends BaseController {
                     if (videoContent != null) {
                         assetQueryWrapper.clear();
                         assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+                        assetQueryWrapper.eq(Asset::getPublished, false);
                         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
                         final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
                         exhibitionBoard.setVideoList(videoList);

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

@@ -10,6 +10,7 @@ import cn.chnmuseum.party.common.vo.GenericPageParam;
 import cn.chnmuseum.party.model.*;
 import cn.chnmuseum.party.service.*;
 import cn.chnmuseum.party.web.controller.base.BaseController;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -120,48 +121,20 @@ public class VideoContentController extends BaseController {
             return getFailResult("400", "名称已存在，请修改名称");
         }
 
-        TUser user = getcurUser();
-        videoContent.setAuditStatus(AuditStatusEnum.TBC.name());
-        boolean flag = videoContentService.updateById(videoContent);
-        if (flag) {
-            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 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);
-
-                    if (StringUtils.isBlank(videoContent.getName())) {
-                        videoContent.setName(asset.getVideoContentName());
-                        this.videoContentService.updateById(videoContent);
-                    }
-
-                    collect.remove(videoFileId);
-                }
-                collect.forEach((k, v) -> this.assetService.removeById(k));
-            }
-
         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.EDIT.name())
                 .status(AuditStatusEnum.TBC.name())
                 .level(AuditStatusEnum.TBC.name())
+                .modelData(JSONObject.toJSONString(videoContent))
                 .build();
         this.auditService.save(audit);
         return getSuccessResult();
     }
-        return getFailResult();
-    }
 
     @GetMapping("/getExhibitionBoardById/{id}")
     @RequiresAuthentication  //@RequiresPermissions("video:content:delete")
@@ -291,6 +264,38 @@ public class VideoContentController extends BaseController {
             }
         }
         final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
+        assetQueryWrapper.eq(Asset::getPublished, true);
+        assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
+        final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper);
+        videoContent.setVideoFileList(videoFileList);
+        videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList()));
+        return getResult(videoContent);
+    }
+
+    @ApiOperation(value = "获取视频内容详情(审核详情使用)", notes = "获取视频内容详情(审核详情使用)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "审核ID", dataType = "String", paramType = "path", required = true)
+    })
+    @GetMapping("/getAudit/{id}")
+    @RequiresAuthentication  //@RequiresPermissions("video:content:get:id")
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.SELECT)
+    public Map<String, Object> getAuditInfoById(@PathVariable("auditId") String auditId) {
+        final VideoContent videoContent = JSONObject.parseObject(this.auditService.getById(auditId).getModelData(), VideoContent.class);
+        final String id = videoContent.getId();
+        if (videoContent.getVideoContentCatId() != null) {
+            VideoContentCat videoContentCat = this.videoContentCatService.getById(videoContent.getVideoContentCatId());
+            if (videoContentCat != null) {
+                videoContent.setVideoContentCatName(videoContentCat.getName());
+            }
+        }
+        if (videoContent.getVideoContentCopyrightOwnerId() != null) {
+            CopyrightOwner copyrightOwner = this.copyrightOwnerService.getById(videoContent.getVideoContentCopyrightOwnerId());
+            if (copyrightOwner != null) {
+                videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
+            }
+        }
+        final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
+        assetQueryWrapper.eq(Asset::getPublished, false);
         assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
         final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper);
         videoContent.setVideoFileList(videoFileList);
@@ -320,13 +325,12 @@ public class VideoContentController extends BaseController {
     })
     @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.DELETE)
     public Map<String, Object> deleteVideoContent(@PathVariable("id") String id) {
-        TUser user = getcurUser();
         final VideoContent videoContent = this.videoContentService.getById(id);
         final Audit audit = Audit.builder()
                 .content(videoContent.getName())
                 .name(videoContent.getName())
                 .refItemId(id)
-                .userId(user.getId())
+                .userId(getcurUser().getId())
                 .type(AuditTypeEnum.VIDEO_CONTENT.name())
                 .operation(AuditOperationEnum.REMOVE.name())
                 .status(AuditStatusEnum.TBC.name())