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> mpMenus; + @ApiModelProperty(value = "页面下的广告图片") + @TableField(exist = false) + private List 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 implements MpPagesService { @Resource private MpMenuService mpMenuService; + @Resource + private MpAdService mpAdService; @Override public PageResult pageRel(MpPagesParam param) { @@ -36,8 +40,10 @@ public class MpPagesServiceImpl extends ServiceImpl impl if (param.getSceneType() != null && param.getSceneType().equals("showMpMenus")) { final List mpMenus = mpMenuService.list(new LambdaUpdateWrapper().eq(MpMenu::getPageId, list.get(0).getId())); final Map> collect = mpMenus.stream().collect(Collectors.groupingBy(MpMenu::getParentId)); + final List ads = mpAdService.list(new LambdaUpdateWrapper().eq(MpAd::getPageId, list.get(0).getId())); list.forEach(d -> { d.setMpMenus(collect); + d.setAds(ads); }); } return new PageResult<>(list, page.getTotal());