angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 公告去掉不需要的逻辑以及代码 ；

This commit is contained in:
cabbage 2025-05-30 11:43:34 +08:00
parent 70c9d5a99e
commit 86d12cdf3c
15 changed files with 12 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiNoticeController.java
View File

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

6
bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdMemberNoticeMapper.java
View File

@ -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;
/**
* <p>
* 会员-站内信 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-12-08
*/
public interface BdMemberNoticeMapper extends BaseMapper<BdMemberNotice> {

6
bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdNoticeDetailMapper.java
View File

@ -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;
/**
* <p>
* 公告详情表 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-06-19
*/
public interface BdNoticeDetailMapper extends BaseMapper<BdNoticeDetail> {

6
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdMemberNoticeService.java
View File

@ -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;
/**
* <p>
* 会员-站内信 服务类
* </p>
*
* @author hzs
* @since 2023-12-08
*/
public interface IBdMemberNoticeService extends IService<BdMemberNotice> {

12
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeDetailService.java
View File

@ -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;
/**
* <p>
* 公告详情表 服务类
* </p>
*
* @author hzs
* @since 2023-06-19
*/
public interface IBdNoticeDetailService extends IService<BdNoticeDetail> {
/**
* 根据站内信ID查询读取信息
* @param pkId 车内信ID
*
* @param pkId 车内信ID
* @param pkMember 会员ID
* @return BdNoticeDetail
*/
BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId,Long pkMember);
BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId, Long pkMember);
}

1
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdNoticeService.java
View File

@ -64,7 +64,6 @@ public interface IBdNoticeService extends IService<BdNotice> {
*/
Object[] getAdminIndexNotice(BdNoticeVO noticeVO);
/**
* 首页显示公告、站内信
*

5
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdMemberNoticeServiceImpl.java
View File

@ -7,12 +7,7 @@ import com.hzs.system.base.service.IBdMemberNoticeService;
import org.springframework.stereotype.Service;
/**
* <p>
* 会员-站内信 服务实现类
* </p>
*
* @author hzs
* @since 2023-12-08
*/
@Service
public class BdMemberNoticeServiceImpl extends ServiceImpl<BdMemberNoticeMapper, BdMemberNotice> implements IBdMemberNoticeService {

14
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdNoticeDetailServiceImpl.java
View File

@ -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;
/**
* <p>
* 公告详情表 服务实现类
* </p>
*
* @author hzs
* @since 2023-06-19
*/
@Service
public class BdNoticeDetailServiceImpl extends ServiceImpl<BdNoticeDetailMapper, BdNoticeDetail> implements IBdNoticeDetailService {
@Override
public BdNoticeDetail selectNoticeDetailByPkNoticeId(Long pkId, Long pkMember) {
QueryWrapper<BdNoticeDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("PK_NOTICE", pkId);
queryWrapper.eq("PK_MEMBER", pkMember);
LambdaQueryWrapper<BdNoticeDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BdNoticeDetail::getPkNotice, pkId);
queryWrapper.eq(BdNoticeDetail::getPkMember, pkMember);
return baseMapper.selectOne(queryWrapper);
}

11
bd-business/bd-business-system/src/main/resources/mapper/system/base/BdMemberNoticeMapper.xml
View File

@ -15,15 +15,4 @@
<result column="PK_NOTICE" property="pkNotice"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
CREATION_TIME,
MODIFIED_TIME,
DEL_FLAG,
PK_COUNTRY,
PK_CREATOR,
PK_MODIFIED,
PK_ID, PK_MEMBER, PK_NOTICE
</sql>
</mapper>

11
bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeDetailMapper.xml
View File

@ -16,15 +16,4 @@
<result column="READ_STATE" property="readState"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
CREATION_TIME,
MODIFIED_TIME,
DEL_FLAG,
PK_COUNTRY,
PK_CREATOR,
PK_MODIFIED,
PK_ID, PK_MEMBER, PK_NOTICE, READ_STATE
</sql>
</mapper>

14
bd-business/bd-business-system/src/main/resources/mapper/system/base/BdNoticeMapper.xml
View File

@ -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 @@
<if test='isShowDay != null and isShowDay == "1"'>
and n.creation_time >= trunc(SYSDATE - 6)
</if>
<if test="systemTypeList != null and systemTypeList.size > 0">
and n.system_type in
<foreach collection="systemTypeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by n.sort desc, n.creation_time desc
</select>
@ -250,12 +244,6 @@
</if>
)
</if>
<if test="systemTypeList != null and systemTypeList.size > 0">
and n.system_type in
<foreach collection="systemTypeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and n.is_pop_screen = 1
order by n.sort desc, n.creation_time desc
</select>

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ENoticeFunctionType.java
View File

@ -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

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESystemType.java
View File

@ -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

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdMemberNotice.java
View File

@ -11,12 +11,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 会员-站内信
* </p>
*
* @author hzs
* @since 2023-12-08
*/
@Data
@Builder

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdNoticeDetail.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 公告详情表
* </p>
*
* @author hzs
* @since 2023-06-19
*/
@Data
@EqualsAndHashCode(callSuper = true)