|
|
@@ -1,10 +1,8 @@
|
|
|
package com.izouma.nineth.service;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
-import com.izouma.nineth.domain.Asset;
|
|
|
+import com.izouma.nineth.domain.*;
|
|
|
import com.izouma.nineth.domain.Collection;
|
|
|
-import com.izouma.nineth.domain.ShowCollection;
|
|
|
-import com.izouma.nineth.domain.Showroom;
|
|
|
import com.izouma.nineth.dto.PageQuery;
|
|
|
import com.izouma.nineth.enums.AssetStatus;
|
|
|
import com.izouma.nineth.enums.CollectionType;
|
|
|
@@ -90,7 +88,11 @@ public class ShowroomService {
|
|
|
showCollections.forEach(showCollection -> {
|
|
|
Collection collection = collectionMap.get(showCollection.getCollectionId());
|
|
|
if (ObjectUtils.isNotEmpty(collection)) {
|
|
|
- showCollection.setPic(collection.getPic().get(0).getUrl());
|
|
|
+ FileObject pic = collection.getPic().get(0);
|
|
|
+ showCollection.setPic(pic.getUrl());
|
|
|
+ if("video/mp4".equals(pic.getType())){
|
|
|
+ showCollection.setPic(pic.getThumb());
|
|
|
+ }
|
|
|
showCollection.setShowroomId(show.getId());
|
|
|
showCollection.setAssetId(collection.getAssetId());
|
|
|
showCollectionRepo.save(showCollection);
|
|
|
@@ -175,7 +177,11 @@ public class ShowroomService {
|
|
|
} else {
|
|
|
Collection collection = collectionMap.get(coll.getCollectionId());
|
|
|
if (ObjectUtils.isNotEmpty(collection)) {
|
|
|
- coll.setPic(collection.getPic().get(0).getUrl());
|
|
|
+ FileObject pic = collection.getPic().get(0);
|
|
|
+ coll.setPic(pic.getUrl());
|
|
|
+ if("video/mp4".equals(pic.getType())){
|
|
|
+ coll.setPic(pic.getThumb());
|
|
|
+ }
|
|
|
coll.setShowroomId(recordRoom.getId());
|
|
|
coll.setAssetId(collection.getAssetId());
|
|
|
showCollectionRepo.save(coll);
|