From 0de8ba03ea7ffe405a063b0a1ffc2ca41d51ec6d Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sun, 2 Mar 2025 23:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extern/LyCompatibleController.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java index 918873c..ce0265e 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java @@ -208,19 +208,21 @@ public class LyCompatibleController { .put("newuservideo", Collections.emptyList()); return response; } - List> videoList = collect.get(0).stream().map(contentPageVO -> { - Map map = new HashMap<>(); - VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId()); - map.put("id", videoRespVO.getId().toString()); - map.put("template_cover_image", contentPageVO.getTemplateCoverUrl()); - Date taskShotDate = taskTaskServiceImpl.getTaskShotDate(videoRespVO.getTaskId()); - map.put("shoottime", DateUtil.format(taskShotDate, "yyyy-MM-dd HH:mm")); - map.put("openid", openId); - map.put("scenicname", contentPageVO.getScenicName()); - map.put("title", contentPageVO.getName()); - map.put("ossurldm", videoRespVO.getVideoUrl()); - return map; - }).collect(Collectors.toList()); + List> videoList = collect.get(0).stream().collect(Collectors.groupingBy(ContentPageVO::getTemplateId)) + .values().stream().map(contentPageVOs -> { + ContentPageVO contentPageVO = contentPageVOs.get(0); + Map map = new HashMap<>(); + VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId()); + map.put("id", videoRespVO.getId().toString()); + map.put("template_cover_image", contentPageVO.getTemplateCoverUrl()); + Date taskShotDate = taskTaskServiceImpl.getTaskShotDate(videoRespVO.getTaskId()); + map.put("shoottime", DateUtil.format(taskShotDate, "yyyy-MM-dd HH:mm")); + map.put("openid", openId); + map.put("scenicname", contentPageVO.getScenicName()); + map.put("title", contentPageVO.getName()); + map.put("ossurldm", videoRespVO.getVideoUrl()); + return map; + }).collect(Collectors.toList()); GoodsReqQuery goodsReqQuery = new GoodsReqQuery(); goodsReqQuery.setSourceType(1); List sourceGoodsList = goodsService.sourceGoodsList(member.getId(), goodsReqQuery);