|
|
@@ -16,6 +16,7 @@ import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -95,8 +96,6 @@ public class ShowroomService {
|
|
|
if ("video/mp4".equals(pic.getType())) {
|
|
|
showCollection.setPic(pic.getThumb());
|
|
|
}
|
|
|
- showCollection.setAssetStatus(assetRepo.findById(collection.getAssetId())
|
|
|
- .orElse(Asset.builder().status(AssetStatus.NORMAL).build()).getStatus());
|
|
|
showCollection.setShowroomId(show.getId());
|
|
|
showCollection.setAssetId(collection.getAssetId());
|
|
|
showCollectionRepo.save(showCollection);
|
|
|
@@ -224,8 +223,6 @@ public class ShowroomService {
|
|
|
coll.setPic(pic.getThumb());
|
|
|
}
|
|
|
coll.setShowroomId(recordRoom.getId());
|
|
|
- showCollection.setAssetStatus(assetRepo.findById(collection.getAssetId())
|
|
|
- .orElse(Asset.builder().status(AssetStatus.NORMAL).build()).getStatus());
|
|
|
// 可能没有
|
|
|
coll.setAssetId(collection.getAssetId());
|
|
|
|
|
|
@@ -263,5 +260,4 @@ public class ShowroomService {
|
|
|
showroomRepo.save(showroom);
|
|
|
cacheService.clearShowroom();
|
|
|
}
|
|
|
-
|
|
|
}
|