From 3579c136d01916bd3dd21c82411070f228285008 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 29 Jul 2025 10:05:52 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E4=BD=93=E7=B3=BBbanner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/config/AdvertBannerServiceApi.java | 2 +- .../controller/api/ApiBdWaresController.java | 2 +- .../controller/api/ApiBannerController.java | 3 +- .../api/ApiBdAdvertBannerController.java | 5 ++-- .../manage/BdAdvertBannerController.java | 29 ++++++++++--------- .../config/mapper/BdAdvertBannerMapper.java | 6 +++- .../provider/AdvertBannerServiceProvider.java | 4 +-- .../service/IBdAdvertBannerService.java | 5 +++- .../impl/BdAdvertBannerServiceImpl.java | 25 ++++++++++++++-- .../system/config/BdAdvertBannerMapper.xml | 19 ++++++++++++ .../domain/system/config/BdAdvertBanner.java | 5 ++++ sql/2025年7月28日_banner增加体系.sql | 3 ++ 12 files changed, 83 insertions(+), 25 deletions(-) create mode 100644 sql/2025年7月28日_banner增加体系.sql diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java index cd101cc0..bf3c49aa 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/AdvertBannerServiceApi.java @@ -12,6 +12,6 @@ public interface AdvertBannerServiceApi { * * @return */ - R> findAll(); + R> findAll(Long userId); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java index fd913e38..5ed801cd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java @@ -514,7 +514,7 @@ public class ApiBdWaresController extends BaseController { waresShowMap = waresShowMapDto.getData(); } // 查询全部的banner (登录后banner) - R> advertBannerList = advertBannerServiceApi.findAll(); + R> advertBannerList = advertBannerServiceApi.findAll(SecurityUtils.getUserId()); // 查询app端首页商品展示信息 RecommendWaresInfoVo recommendWaresInfoVo = iBdWaresService.queryRecommendInfo(pkCountry, memberCode, userId, waresShowMap); if (recommendWaresInfoVo.getWaresVoList() != null) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiBannerController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiBannerController.java index 5cedcb4e..f79ea3b5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiBannerController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiBannerController.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.system.config.BdAdvertBanner; +import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.config.dto.AdvertBannerDTO; import com.hzs.system.config.service.IBdAdvertBannerService; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +33,7 @@ public class ApiBannerController extends BaseController { */ @GetMapping("/list") public AjaxResult list() { - List bannerList = iBdAdvertBannerService.listData(null); + List bannerList = iBdAdvertBannerService.listData(null, SecurityUtils.getUserId()); if (CollectionUtil.isNotEmpty(bannerList)) { return AjaxResult.success(bannerList.stream().map(advertBanner -> BeanUtil.copyProperties(advertBanner, AdvertBannerDTO.class)).collect(Collectors.toList())); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdAdvertBannerController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdAdvertBannerController.java index 1206376d..b86c7e61 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdAdvertBannerController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdAdvertBannerController.java @@ -6,6 +6,7 @@ import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.config.BdAdvertBanner; +import com.hzs.common.security.utils.SecurityUtils; import com.hzs.system.config.service.IBdAdvertBannerService; import com.hzs.system.config.vo.ApiAdvertBannerVO; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +39,7 @@ public class ApiBdAdvertBannerController extends BaseController { **/ @GetMapping("/list") public TableDataInfo list(BdAdvertBanner banner) { - List list = advertBannerService.listData(banner); + List list = advertBannerService.listData(banner, SecurityUtils.getUserId()); return getDataTable(list); } @@ -52,7 +53,7 @@ public class ApiBdAdvertBannerController extends BaseController { // 返回结果 List resultList = new ArrayList<>(); - List list = advertBannerService.listData(null); + List list = advertBannerService.listData(null, SecurityUtils.getUserId()); if (CollectionUtil.isNotEmpty(list)) { resultList = BeanUtil.copyToList(list, ApiAdvertBannerVO.class); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAdvertBannerController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAdvertBannerController.java index 85e67d66..2f896620 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAdvertBannerController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAdvertBannerController.java @@ -44,20 +44,21 @@ public class BdAdvertBannerController extends BaseController { @GetMapping("/list") public TableDataInfo list(BdAdvertBannerExt advertBannerExt) { startPage(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (StringUtils.isNotNull(advertBannerExt.getPosition())) { - queryWrapper.eq("POSITION", advertBannerExt.getPosition()); - } - if (StringUtils.isNotNull(advertBannerExt.getStartDate()) - && StringUtils.isNotNull(advertBannerExt.getEndDate())) { - queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate()); - } - if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate()) - && StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) { - queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate()); - } - queryWrapper.orderByAsc("SORT"); - List list = advertBannerService.list(queryWrapper); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// if (StringUtils.isNotNull(advertBannerExt.getPosition())) { +// queryWrapper.eq("POSITION", advertBannerExt.getPosition()); +// } +// if (StringUtils.isNotNull(advertBannerExt.getStartDate()) +// && StringUtils.isNotNull(advertBannerExt.getEndDate())) { +// queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate()); +// } +// if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate()) +// && StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) { +// queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate()); +// } +// queryWrapper.orderByAsc("SORT"); +// List list = advertBannerService.list(queryWrapper); + List list = advertBannerService.getList(advertBannerExt); if (CollectionUtil.isNotEmpty(list)) { for (BdAdvertBanner bdAdvertBanner : list) { EPositionTwo ePositionTwo = EPositionTwo.getEnumByValue(bdAdvertBanner.getPosition()); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAdvertBannerMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAdvertBannerMapper.java index 14e59940..67189cc8 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAdvertBannerMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdAdvertBannerMapper.java @@ -3,6 +3,10 @@ package com.hzs.system.config.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.config.BdAdvertBanner; +import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,5 +17,5 @@ import com.hzs.common.domain.system.config.BdAdvertBanner; * @since 2023-04-13 */ public interface BdAdvertBannerMapper extends BaseMapper { - + List getList(@Param("param")BdAdvertBannerExt param); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AdvertBannerServiceProvider.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AdvertBannerServiceProvider.java index 844032f2..aecc3c7b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AdvertBannerServiceProvider.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/AdvertBannerServiceProvider.java @@ -26,10 +26,10 @@ public class AdvertBannerServiceProvider implements AdvertBannerServiceApi { * @return */ @Override - public R> findAll() { + public R> findAll(Long userId) { List bannerDTOList = new ArrayList<>(); - List bannerList = advertBannerService.listData(null); + List bannerList = advertBannerService.listData(null, userId); if (CollectionUtil.isNotEmpty(bannerList)) { bannerDTOList = bannerList.stream().map(advertBanner -> BeanUtil.copyProperties(advertBanner, AdvertBannerDTO.class)).collect(Collectors.toList()); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAdvertBannerService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAdvertBannerService.java index 913b9d9b..db894566 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAdvertBannerService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAdvertBannerService.java @@ -2,6 +2,8 @@ package com.hzs.system.config.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.config.BdAdvertBanner; +import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,6 +18,7 @@ public interface IBdAdvertBannerService extends IService { * @param banner 查询banner * @return */ - List listData(BdAdvertBanner banner); + List listData(BdAdvertBanner banner, Long userId); + List getList(BdAdvertBannerExt param); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java index 02b92292..5c53ddea 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java @@ -1,15 +1,23 @@ package com.hzs.system.config.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.enums.EPositionTwo; import com.hzs.common.core.utils.StringUtils; +import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.system.config.BdAdvertBanner; +import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt; +import com.hzs.common.security.utils.SecurityUtils; +import com.hzs.member.base.IMemberServiceApi; import com.hzs.system.config.mapper.BdAdvertBannerMapper; import com.hzs.system.config.service.IBdAdvertBannerService; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -19,8 +27,10 @@ import java.util.List; @Service public class BdAdvertBannerServiceImpl extends ServiceImpl implements IBdAdvertBannerService { + @DubboReference + IMemberServiceApi iMemberServiceApi; @Override - public List listData(BdAdvertBanner banner) { + public List listData(BdAdvertBanner banner, Long userId) { if (null == banner) { banner = new BdAdvertBanner(); } @@ -32,10 +42,21 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex())); + } queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY); queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date()); queryWrapper.orderByAsc(BdAdvertBanner::getSort); - return this.list(); + return this.list(queryWrapper); + } + + @Override + public List getList(BdAdvertBannerExt param) { + return baseMapper.getList(param); } } diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdAdvertBannerMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdAdvertBannerMapper.xml index 462cf201..a79fe61a 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdAdvertBannerMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdAdvertBannerMapper.xml @@ -28,5 +28,24 @@ PK_MODIFIED, PK_ID, POSITION, EFFECTIVE_DATE, SORT, PICTURE, LINK + diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAdvertBanner.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAdvertBanner.java index d5723ea0..c4e49948 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAdvertBanner.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAdvertBanner.java @@ -72,5 +72,10 @@ public class BdAdvertBanner extends BaseEntity { @TableField("LINK") private String link; + @TableField("PK_VERTEX") + private Integer pkVertex; + + @TableField(exist = false) + private String vertexName; } diff --git a/sql/2025年7月28日_banner增加体系.sql b/sql/2025年7月28日_banner增加体系.sql new file mode 100644 index 00000000..0df44624 --- /dev/null +++ b/sql/2025年7月28日_banner增加体系.sql @@ -0,0 +1,3 @@ +ALTER TABLE "BD_ADVERT_BANNER" + ADD ("PK_VERTEX" NUMBER(6,0)); +COMMENT ON COLUMN "BD_ADVERT_BANNER"."PK_VERTEX" IS '体系ID';