From 86d12cdf3c0653c675f8614744b2afc251ba68d8 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 30 May 2025 11:43:34 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=AC=E5=91=8A=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E9=80=BB=E8=BE=91=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BB=A3=E7=A0=81=20=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/api/ApiNoticeController.java | 8 ++------ .../system/base/mapper/BdMemberNoticeMapper.java | 6 ------ .../system/base/mapper/BdNoticeDetailMapper.java | 6 ------ .../base/service/IBdMemberNoticeService.java | 6 ------ .../base/service/IBdNoticeDetailService.java | 12 ++++-------- .../hzs/system/base/service/IBdNoticeService.java | 1 - .../service/impl/BdMemberNoticeServiceImpl.java | 5 ----- .../service/impl/BdNoticeDetailServiceImpl.java | 14 ++++---------- .../mapper/system/base/BdMemberNoticeMapper.xml | 11 ----------- .../mapper/system/base/BdNoticeDetailMapper.xml | 11 ----------- .../mapper/system/base/BdNoticeMapper.xml | 14 +------------- .../hzs/common/core/enums/ENoticeFunctionType.java | 6 ------ .../com/hzs/common/core/enums/ESystemType.java | 6 +----- .../common/domain/system/base/BdMemberNotice.java | 5 ----- .../common/domain/system/base/BdNoticeDetail.java | 5 ----- 15 files changed, 12 insertions(+), 104 deletions(-) diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java index c4b9e390..9235e525 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java @@ -35,15 +35,13 @@ public class ApiNoticeController extends BaseController { * @param functionType 1：公告 2：站内信 * @return TableDataInfo */ - @GetMapping("index-list") + @GetMapping("/index-list") public TableDataInfo indexList(Integer functionType) { BdNoticeVO noticeVO = new BdNoticeVO(); noticeVO.setPkCountry(SecurityUtils.getPkCountry()); noticeVO.setPkMember(SecurityUtils.getUserId()); noticeVO.setWebsiteType(ENoticeWebsiteType.MEMBER.getValue()); noticeVO.setFunctionType(functionType); - // 查询直销和全部的 - noticeVO.setSystemTypeList(Arrays.asList(ESystemType.DEFAULT.getValue(), ESystemType.ALL.getValue())); startPage(); Object[] objects = iBdNoticeService.showIndexNotice(noticeVO); @@ -59,7 +57,7 @@ public class ApiNoticeController extends BaseController { * * @return TableDataInfo */ - @GetMapping("index-pop-screen") + @GetMapping("/index-pop-screen") public AjaxResult indexPopScreen(String grade, String awards) { BdNoticeVO noticeVO = new BdNoticeVO(); noticeVO.setPkCountry(SecurityUtils.getPkCountry()); @@ -67,8 +65,6 @@ public class ApiNoticeController extends BaseController { noticeVO.setFunctionType(ENoticeFunctionType.NOTICE.getValue()); noticeVO.setGrade(grade); noticeVO.setAwards(awards); - // 查询直销和全部的 - noticeVO.setSystemTypeList(Arrays.asList(ESystemType.DEFAULT.getValue(), ESystemType.ALL.getValue())); return AjaxResult.success(iBdNoticeService.showIndexPopScreen(noticeVO)); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdMemberNoticeMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdMemberNoticeMapper.java index 11ce9999..5a4be47a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdMemberNoticeMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdMemberNoticeMapper.java @@ -1,16 +1,10 @@ package com.hzs.system.base.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.base.BdMemberNotice; /** - *

* 会员-站内信 Mapper 接口 - *

- * - * @author hzs - * @since 2023-12-08 */ public interface BdMemberNoticeMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeDetailMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeDetailMapper.java index fe2e07c3..b89d8455 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeDetailMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeDetailMapper.java @@ -1,16 +1,10 @@ package com.hzs.system.base.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.system.base.BdNoticeDetail; /** - *

* 公告详情表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-06-19 */ public interface BdNoticeDetailMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdMemberNoticeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdMemberNoticeService.java index a2087807..b7db3ee5 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdMemberNoticeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdMemberNoticeService.java @@ -1,16 +1,10 @@ package com.hzs.system.base.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.base.BdMemberNotice; /** - *

* 会员-站内信 服务类 - *

- * - * @author hzs - * @since 2023-12-08 */ public interface IBdMemberNoticeService extends IService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeDetailService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeDetailService.java index 574acdaa..c2903109 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeDetailService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeDetailService.java @@ -1,24 +1,20 @@ package com.hzs.system.base.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.system.base.BdNoticeDetail; /** - *

* 公告详情表 服务类 - *

- * - * @author hzs - * @since 2023-06-19 */ public interface IBdNoticeDetailService extends IService { + /** * 根据站内信ID查询读取信息 - * @param pkId 车内信ID + * + * @param pkId 车内信ID * @param pkMember 会员ID * @return BdNoticeDetail */ - BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId,Long pkMember); + BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId, Long pkMember); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java index 27a59e83..0f709298 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java @@ -64,7 +64,6 @@ public interface IBdNoticeService extends IService { */ Object[] getAdminIndexNotice(BdNoticeVO noticeVO); - /** * 首页显示公告、站内信 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdMemberNoticeServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdMemberNoticeServiceImpl.java index 5301ef26..5faa0a77 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdMemberNoticeServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdMemberNoticeServiceImpl.java @@ -7,12 +7,7 @@ import com.hzs.system.base.service.IBdMemberNoticeService; import org.springframework.stereotype.Service; /** - *

* 会员-站内信 服务实现类 - *

- * - * @author hzs - * @since 2023-12-08 */ @Service public class BdMemberNoticeServiceImpl extends ServiceImpl implements IBdMemberNoticeService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeDetailServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeDetailServiceImpl.java index 3e9b28e1..ba59a4db 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeDetailServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.hzs.system.base.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.system.base.BdNoticeDetail; import com.hzs.system.base.mapper.BdNoticeDetailMapper; @@ -9,21 +8,16 @@ import com.hzs.system.base.service.IBdNoticeDetailService; import org.springframework.stereotype.Service; /** - *

* 公告详情表 服务实现类 - *

- * - * @author hzs - * @since 2023-06-19 */ @Service public class BdNoticeDetailServiceImpl extends ServiceImpl implements IBdNoticeDetailService { @Override public BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId, Long pkMember) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_NOTICE", pkId); - queryWrapper.eq("PK_MEMBER", pkMember); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdNoticeDetail::getPkNotice, pkId); + queryWrapper.eq(BdNoticeDetail::getPkMember, pkMember); return baseMapper.selectOne(queryWrapper); } diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdMemberNoticeMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdMemberNoticeMapper.xml index 608c2eb9..5d3e7797 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdMemberNoticeMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdMemberNoticeMapper.xml @@ -15,15 +15,4 @@ - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, PK_NOTICE - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeDetailMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeDetailMapper.xml index 47211a29..e0d14867 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeDetailMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeDetailMapper.xml @@ -16,15 +16,4 @@ - - - CREATION_TIME, - MODIFIED_TIME, - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, PK_NOTICE, READ_STATE - - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml index 562b14a5..7ef36e13 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml @@ -156,7 +156,7 @@ n.is_pop_screen isPopScreen from bd_notice n where n.del_flag = 0 - and n.approve_state=2 + and n.approve_state = 2 and n.pk_country = #{pkCountry} and n.function_type = #{functionType} and n.website_type = #{websiteType} @@ -171,12 +171,6 @@ and n.creation_time >= trunc(SYSDATE - 6) - - and n.system_type in - - #{item} - - order by n.sort desc, n.creation_time desc @@ -250,12 +244,6 @@ ) - - and n.system_type in - - #{item} - - and n.is_pop_screen = 1 order by n.sort desc, n.creation_time desc diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeFunctionType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeFunctionType.java index f9cd683a..0bff1466 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeFunctionType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeFunctionType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 公告功能的类型 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/2 11:35 - * @Classname: ENoticeType - * @Package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java index 9172ca07..a99f4b4d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 会员系统分类 - * @Author: jiang chao - * @Time: 2024/10/14 11:29 - * @Classname: ESystemType - * @PackageName: com.hzs.common.core.enums + * 会员系统分类 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdMemberNotice.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdMemberNotice.java index 95e65a1c..23a2223f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdMemberNotice.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdMemberNotice.java @@ -11,12 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员-站内信 - *

- * - * @author hzs - * @since 2023-12-08 */ @Data @Builder diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNoticeDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNoticeDetail.java index 5ef63737..93d04f8b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNoticeDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNoticeDetail.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 公告详情表 - *

- * - * @author hzs - * @since 2023-06-19 */ @Data @EqualsAndHashCode(callSuper = true)