bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/FileTypeEnum.java

@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.common.enums;
 
 public enum FileTypeEnum {
 
+    DOC("Doc", "文档"),
     IMAGE("Image", "图片"),
     AUDIO("Audio", "音频"),
     VIDEO("Video", "视频");

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

@@ -4,6 +4,7 @@ import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.model.Asset;
 import cn.wisenergy.chnmuseum.party.model.AssetType;
+import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
 import cn.wisenergy.chnmuseum.party.service.AssetService;
 import cn.wisenergy.chnmuseum.party.service.AssetTypeService;
 import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <pre>
@@ -132,8 +134,14 @@ public class AssetTypeController extends BaseController {
                 AssetType::getUpdateTime);
         Page<AssetType> page = this.assetTypeService.page(getPage(), queryWrapper);
         for (AssetType assetType : page.getRecords()) {
-
-
+            LambdaQueryWrapper<Asset> lambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getAssetTypeId, assetType.getId());
+            //lambdaQueryWrapper.eq(Asset::getAuditStatusAdd)
+            lambdaQueryWrapper = lambdaQueryWrapper.select(Asset::getId).select(Asset::getAssetCopyrightOwnerId);
+            List<Asset> assetList = this.assetService.list(lambdaQueryWrapper);
+            final List<String> assetCopyrightOwnerIdList = assetList.stream().map(Asset::getAssetCopyrightOwnerId).collect(Collectors.toList());
+            List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(assetCopyrightOwnerIdList);
+            String copyrightOwnerName = copyrightOwnerList.stream().map(CopyrightOwner::getName).collect(Collectors.joining("、"));
+            assetType.setCopyrightOwnerName(copyrightOwnerName);
         }
         return getResult(page);
     }

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

@@ -156,7 +156,7 @@ public class FileUploadController {
 
             handleResult.setFileName(originalFilename);
             handleResult.setFileType(FileTypeEnum.VIDEO.getName());
-            handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
+            handleResult.setHandleResult(HANDLE_STATUS_ENUM.SUCCESS.getName());
             boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, FilenameUtils.getExtension(originalFilename).toUpperCase()));
             if (anyMatch) {
                 String url = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename);