diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java index e5990ab..b733ab8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java @@ -63,6 +63,9 @@ public class EmployeeConfirm extends BaseEntity { @ApiModelProperty("工作id") private Long jobId; + @ApiModelProperty("移动端用户id") + private Long userId; + /** * 申请id */ diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java index f58ea7a..3ff92b8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Notice.java @@ -31,7 +31,7 @@ public class Notice extends BaseEntity private Integer notReadCount; @ApiModelProperty("是否阅读 0未读 1已读") - private Integer isRead; + private String isRead; @JsonFormat(pattern = "MM-dd") @ApiModelProperty("日期") diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/NoticeMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/NoticeMapper.java index 2abccf1..b7677ff 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/NoticeMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/NoticeMapper.java @@ -4,7 +4,10 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.cms.domain.Notice; +import java.util.List; + public interface NoticeMapper extends BaseMapper { + List getNoticlist(Notice notice); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java index bf2ea71..cfaa9af 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java @@ -127,7 +127,7 @@ public class AppNoticeServiceImpl implements IAppNoticeService Notice notice = new Notice(); notice.setUserId(appUser.getUserId()); notice.setTitle("职位上新"); - notice.setIsRead(0); + notice.setIsRead(StringUtil.NOTICE_WD); notice.setDate(new Date()); //todo update number of job notice.setSubTitle("这里有10个岗位很适合你,快来看看吧"); @@ -169,14 +169,14 @@ public class AppNoticeServiceImpl implements IAppNoticeService List longs = StringUtil.convertStringToLongList(ids); List notices = noticeInfoMapper.selectBatchIds(longs); notices.forEach(notice -> { - notice.setIsRead(1); + notice.setIsRead(StringUtil.NOTICE_YD); noticeInfoMapper.updateById(notice); }); List notices1 = noticeInfoMapper.selectList(Wrappers.lambdaQuery().eq(Notice::getUserId, SiteSecurityUtils.getUserId()).eq(Notice::getRemark, "notice_bar").eq(Notice::getTitle, "系统通知").orderByDesc(Notice::getCreateTime).last("limit 1")); Notice notice = notices1.get(0); notice.setNotReadCount(notice.getNotReadCount() - longs.size()); if(notice.getNotReadCount()==0){ - notice.setIsRead(1); + notice.setIsRead(StringUtil.NOTICE_YD); } noticeInfoMapper.updateById(notice); } @@ -186,7 +186,7 @@ public class AppNoticeServiceImpl implements IAppNoticeService List longs = StringUtil.convertStringToLongList(ids); List notices = noticeInfoMapper.selectBatchIds(longs); notices.forEach(notice -> { - notice.setIsRead(1); + notice.setIsRead(StringUtil.NOTICE_YD); notice.setNotReadCount(0); noticeInfoMapper.updateById(notice); }); @@ -201,8 +201,10 @@ public class AppNoticeServiceImpl implements IAppNoticeService @Override public List selectListAppNotRead(Notice notice) { - List sysNoticeList = noticeInfoMapper.selectList(Wrappers.lambdaQuery().eq(Notice::getUserId, notice.getUserId()).eq(Notice::getRemark,"notice_bar").eq(Notice::getIsRead,0).orderByDesc(Notice::getCreateTime)); - return sysNoticeList; + notice.setRemark(StringUtil.NOTICE_TYPE); + notice.setIsRead(StringUtil.NOTICE_WD); + //List sysNoticeList = noticeInfoMapper.selectList(Wrappers.lambdaQuery().eq(Notice::getUserId, notice.getUserId()).eq(Notice::getRemark,"notice_bar").eq(Notice::getIsRead,0).orderByDesc(Notice::getCreateTime)); + return noticeInfoMapper.getNoticlist(notice); } @Override @@ -210,22 +212,22 @@ public class AppNoticeServiceImpl implements IAppNoticeService List longs = StringUtil.convertStringToLongList(ids); List notices = noticeInfoMapper.selectBatchIds(longs); notices.forEach(notice -> { - notice.setIsRead(1); + notice.setIsRead(StringUtil.NOTICE_YD); noticeInfoMapper.updateById(notice); }); List notices1 = noticeInfoMapper.selectList(Wrappers.lambdaQuery().eq(Notice::getUserId, userId).eq(Notice::getRemark, "notice_bar").eq(Notice::getTitle, "系统通知").orderByDesc(Notice::getCreateTime).last("limit 1")); Notice notice = notices1.get(0); notice.setNotReadCount(notice.getNotReadCount() - longs.size()); if(notice.getNotReadCount()==0){ - notice.setIsRead(1); + notice.setIsRead(StringUtil.NOTICE_YD); } noticeInfoMapper.updateById(notice); } @Override public List selectListAppNotics(Notice notice) { - List sysNoticeList = noticeInfoMapper.selectList(Wrappers.lambdaQuery().eq(Notice::getUserId, notice.getUserId()).eq(Notice::getRemark,"notice_bar").orderByDesc(Notice::getCreateTime)); - return sysNoticeList; + notice.setRemark(StringUtil.NOTICE_TYPE); + return noticeInfoMapper.getNoticlist(notice); } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java index aec57d0..1a750fd 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java @@ -25,6 +25,16 @@ public class StringUtil { * pc端-企业 */ public static final String SYS_QY = "100"; + /** + * 消息已读 + */ + public static final String NOTICE_YD="1"; + /** + * 消息未读 + */ + public static final String NOTICE_WD="0"; + + public static final String NOTICE_TYPE="notice_bar"; public static Boolean isEmptyOrNull(String s){ if(Objects.isNull(s)){return true;} diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/NoticeMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/NoticeMapper.xml index 4561888..8666439 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/NoticeMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/NoticeMapper.xml @@ -3,6 +3,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + select notice_id, title,sub_title, notice_type, notice_content, is_read,user_id,not_read_count,date, del_flag, create_by, create_time, update_by, remark,bussiness_id from notice + + + \ No newline at end of file