From e36606b585b1a08e00dbb227f904f6a673ccdfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 23 Jul 2024 02:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EMpAd=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gxwebsoft/cms/entity/MpAd.java            | 3 +++
 src/main/java/com/gxwebsoft/cms/entity/MpPages.java         | 4 ++++
 .../com/gxwebsoft/cms/service/impl/MpPagesServiceImpl.java  | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/cms/entity/MpAd.java b/src/main/java/com/gxwebsoft/cms/entity/MpAd.java
index 2da1963..890a022 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/MpAd.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/MpAd.java
@@ -33,6 +33,9 @@ public class MpAd implements Serializable {
     @ApiModelProperty(value = "页面ID")
     private Integer pageId;
 
+    @ApiModelProperty(value = "页面名称")
+    private String pageName;
+
     @ApiModelProperty(value = "广告类型")
     private String adType;
 
diff --git a/src/main/java/com/gxwebsoft/cms/entity/MpPages.java b/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
index f49eb62..c3912c2 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/MpPages.java
@@ -74,4 +74,8 @@ public class MpPages implements Serializable {
     @TableField(exist = false)
     private Map<Integer, List<MpMenu>> mpMenus;
 
+    @ApiModelProperty(value = "页面下的广告图片")
+    @TableField(exist = false)
+    private List<MpAd> ads;
+
 }
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/MpPagesServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/MpPagesServiceImpl.java
index 820c6f8..beae530 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/MpPagesServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/MpPagesServiceImpl.java
@@ -2,8 +2,10 @@ package com.gxwebsoft.cms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.entity.MpAd;
 import com.gxwebsoft.cms.entity.MpMenu;
 import com.gxwebsoft.cms.mapper.MpPagesMapper;
+import com.gxwebsoft.cms.service.MpAdService;
 import com.gxwebsoft.cms.service.MpMenuService;
 import com.gxwebsoft.cms.service.MpPagesService;
 import com.gxwebsoft.cms.entity.MpPages;
@@ -27,6 +29,8 @@ import java.util.stream.Collectors;
 public class MpPagesServiceImpl extends ServiceImpl<MpPagesMapper, MpPages> implements MpPagesService {
     @Resource
     private MpMenuService mpMenuService;
+    @Resource
+    private MpAdService mpAdService;
 
     @Override
     public PageResult<MpPages> pageRel(MpPagesParam param) {
@@ -36,8 +40,10 @@ public class MpPagesServiceImpl extends ServiceImpl<MpPagesMapper, MpPages> impl
         if (param.getSceneType() != null && param.getSceneType().equals("showMpMenus")) {
           final List<MpMenu> mpMenus = mpMenuService.list(new LambdaUpdateWrapper<MpMenu>().eq(MpMenu::getPageId, list.get(0).getId()));
           final Map<Integer, List<MpMenu>> collect = mpMenus.stream().collect(Collectors.groupingBy(MpMenu::getParentId));
+          final List<MpAd> ads = mpAdService.list(new LambdaUpdateWrapper<MpAd>().eq(MpAd::getPageId, list.get(0).getId()));
           list.forEach(d -> {
             d.setMpMenus(collect);
+            d.setAds(ads);
           });
         }
         return new PageResult<>(list, page.getTotal());