|
|
@@ -659,13 +659,14 @@ public class PlanNewController {
|
|
|
List<Poster> t3 = f.getT3();
|
|
|
List<PlanNewRes> collect = t2.stream().map(fe -> {
|
|
|
PlanNewRes planNewRes = new PlanNewRes();
|
|
|
- Optional<String> first = t3.stream().filter(ff -> Objects.nonNull( ff.posterTemplateId())
|
|
|
- && Objects.nonNull( fe.posterTemplateId())
|
|
|
- && ff.posterTemplateId().equals(fe.posterTemplateId()))
|
|
|
- .filter(f11->Objects.nonNull(f11.generateImagesUrl()))
|
|
|
- .map(Poster::generateImagesUrl).findFirst();
|
|
|
- first.ifPresent(planNewRes::setPosterUrl);
|
|
|
+// Optional<String> first = t3.stream().filter(ff -> Objects.nonNull( ff.posterTemplateId())
|
|
|
+// && Objects.nonNull( fe.posterTemplateId())
|
|
|
+// && ff.posterTemplateId().equals(fe.posterTemplateId()))
|
|
|
+// .filter(f11->Objects.nonNull(f11.generateImagesUrl()))
|
|
|
+// .map(Poster::generateImagesUrl).findFirst();
|
|
|
+// first.ifPresent(planNewRes::setPosterUrl);
|
|
|
planNewRes.setPlanNew(fe);
|
|
|
+ planNewRes.setPosterUrl(fe.previewUrl());
|
|
|
return planNewRes;
|
|
|
}).collect(Collectors.toList());
|
|
|
Paged<PlanNewRes> planNewResPaged = new Paged<>(f.getT1(), collect, request.getPage(), request.getSize());
|