Merge remote-tracking branch 'origin/dev' into dev

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<BdAdvertBanner> list = advertBannerService.listData(banner);
+        List<BdAdvertBanner> list = advertBannerService.listData(banner, SecurityUtils.getUserId());
         return getDataTable(list);
     }
 
@@ -52,7 +53,7 @@ public class ApiBdAdvertBannerController extends BaseController {
         // 返回结果
         List<ApiAdvertBannerVO> resultList = new ArrayList<>();
 
-        List<BdAdvertBanner> list = advertBannerService.listData(null);
+        List<BdAdvertBanner> list = advertBannerService.listData(null, SecurityUtils.getUserId());
         if (CollectionUtil.isNotEmpty(list)) {
             resultList = BeanUtil.copyToList(list, ApiAdvertBannerVO.class);
         }

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<BdAdvertBanner> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<BdAdvertBanner> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotNull(advertBannerExt.getPosition())) {
+//        if (StringUtils.isNotNull(advertBannerExt.getPosition())) {
-            queryWrapper.eq("POSITION", advertBannerExt.getPosition());
+//            queryWrapper.eq("POSITION", advertBannerExt.getPosition());
-        }
+//        }
-        if (StringUtils.isNotNull(advertBannerExt.getStartDate())
+//        if (StringUtils.isNotNull(advertBannerExt.getStartDate())
-                && StringUtils.isNotNull(advertBannerExt.getEndDate())) {
+//                && StringUtils.isNotNull(advertBannerExt.getEndDate())) {
-            queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate());
+//            queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate());
-        }
+//        }
-        if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate())
+//        if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate())
-                && StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) {
+//                && StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) {
-            queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate());
+//            queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate());
-        }
+//        }
-        queryWrapper.orderByAsc("SORT");
+//        queryWrapper.orderByAsc("SORT");
-        List<BdAdvertBanner> list = advertBannerService.list(queryWrapper);
+//        List<BdAdvertBanner> list = advertBannerService.list(queryWrapper);
+        List<BdAdvertBanner> list = advertBannerService.getList(advertBannerExt);
         if (CollectionUtil.isNotEmpty(list)) {
             for (BdAdvertBanner bdAdvertBanner : list) {
                 EPositionTwo ePositionTwo = EPositionTwo.getEnumByValue(bdAdvertBanner.getPosition());

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;
 
 /**
  * <p>
@@ -13,5 +17,5 @@ import com.hzs.common.domain.system.config.BdAdvertBanner;
  * @since 2023-04-13
  */
 public interface BdAdvertBannerMapper extends BaseMapper<BdAdvertBanner> {
-
+    List<BdAdvertBanner> getList(@Param("param") BdAdvertBannerExt param);
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAdvertBannerService.java

@@ -2,6 +2,7 @@ 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 java.util.List;
 
@@ -19,6 +20,9 @@ public interface IBdAdvertBannerService extends IService<BdAdvertBanner> {
      * @param banner 查询banner
      * @return
      */
-    List<BdAdvertBanner> listData(BdAdvertBanner banner);
+//    List<BdAdvertBanner> listData(BdAdvertBanner banner);
 
+    List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId);
+
+    List<BdAdvertBanner> getList(BdAdvertBannerExt param);
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java

@@ -1,13 +1,18 @@
 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.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.stereotype.Service;
 
 import java.util.Date;
@@ -22,12 +27,14 @@ import java.util.List;
 @Service
 public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper, BdAdvertBanner> implements IBdAdvertBannerService {
 
+    @DubboReference
+    IMemberServiceApi iMemberServiceApi;
     @Override
-    public List<BdAdvertBanner> listData(BdAdvertBanner banner) {
+    public List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId) {
         if (null == banner) {
             banner = new BdAdvertBanner();
         }
-
+        CuMember cuMember = iMemberServiceApi.getMember(userId).getData();
         LambdaQueryWrapper<BdAdvertBanner> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotNull(banner.getPosition())) {
             queryWrapper.eq(BdAdvertBanner::getPosition, banner.getPosition());
@@ -35,10 +42,20 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
             // 默认首页的banner
             queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue());
         }
+        if(ObjectUtil.isEmpty(cuMember)){
+            queryWrapper.isNull(BdAdvertBanner::getPkVertex);
+        }else{
+            queryWrapper.and(qw ->  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<BdAdvertBanner> getList(BdAdvertBannerExt param) {
+        return baseMapper.getList(param);
     }
 
 }

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
     </sql>
+    <select id="getList" resultType="com.hzs.common.domain.system.config.BdAdvertBanner">
+        select bab.*, bv.VERTEX_NAME as vertexName from BD_ADVERT_BANNER bab
+        left join BD_VERTEX bv on bv.pk_id = bab.PK_VERTEX
+        where 1=1
+        <if test="param.position != null">
+            and bab.position = #{position}
+        </if>
+        <if test="param.startDate != null and param.endDate != null">
+            and bab.CREATION_TIME between #{param.startDate} and #{param.endDate}
+        </if>
+        <if test="param.startEffectiveDate != null and param.endEffectiveDate != null">
+            and bab.effectiveDate between #{param.startEffectiveDate} and #{param.endEffectiveDate}
+        </if>
+        <if test="param.pkVertex != null">
+            and bab.PK_VERTEX = #{param.pkVertex}
+        </if>
+        and bab.del_flag = 0
+        order by bab.sort asc
+    </select>
 
 </mapper>

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;
 
 }

sql/2025年7月30日_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';