diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppNoticeInfoController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppNoticeInfoController.java index 6a913a3..e3a66d9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppNoticeInfoController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppNoticeInfoController.java @@ -1,5 +1,6 @@ package com.ruoyi.cms.controller.app; +import com.alibaba.excel.util.StringUtils; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.Notice; import com.ruoyi.cms.service.IAppNoticeService; @@ -44,6 +45,19 @@ public class AppNoticeInfoController extends BaseController { appNoticeService.sysNotice(id); return AjaxResult.success(); } + + @ApiOperation("通知已读") + @PostMapping("/read/noticeRead") + @BussinessLog(title = "系统通知标记已读") + public AjaxResult noticeRead(@RequestParam String id) + { + if(StringUtils.isBlank(id)){ + return error("参数为空!"); + } + appNoticeService.noticeRead(id); + return AjaxResult.success(); + } + @ApiOperation("岗位推荐、招聘会已读") @PostMapping("/read") @BussinessLog(title = "岗位推荐、招聘会已读标记已读") diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java index e278d2c..a914328 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppNoticeService.java @@ -94,4 +94,6 @@ public interface IAppNoticeService NoticeTotal noticTotal(Notice notice); int removeNotice(Long[] ids); + + void noticeRead(String ids); } 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 80643ce..c85fa09 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 @@ -1,6 +1,7 @@ package com.ruoyi.cms.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cms.domain.*; import com.ruoyi.cms.domain.vo.NoticeTotal; @@ -256,5 +257,14 @@ public class AppNoticeServiceImpl implements IAppNoticeService int t=noticeInfoMapper.deleteBatchIds(Arrays.asList(ids)); return t; } + + @Override + public void noticeRead(String ids) { + List longs = StringUtil.convertStringToLongList(ids); + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); + updateWrapper.in(Notice::getNoticeId, longs) + .set(Notice::getIsRead, NoticeUtils.NOTICE_YD); + noticeInfoMapper.update(null, updateWrapper); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index 78eb4c9..887a4bd 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cms.domain.FairCollection; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; +import com.ruoyi.cms.domain.Notice; import com.ruoyi.cms.domain.query.MineJobQuery; import com.ruoyi.cms.domain.vo.CandidateVO; +import com.ruoyi.cms.domain.vo.NoticeTotal; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.service.IJobApplyService; import com.ruoyi.common.core.domain.entity.AppUser; @@ -38,6 +40,8 @@ public class JobApplyServiceImpl extends ServiceImpl im private FairCollectionMapper fairCollectionMapper; @Autowired private CompanyCollectionMapper companyCollectionMapper; + @Autowired + private NoticeMapper noticeMapper; /** * 查询岗位申请 @@ -113,12 +117,18 @@ public class JobApplyServiceImpl extends ServiceImpl im Integer collectionCompanyCount = companyCollectionMapper.collectionJob(SiteSecurityUtils.getUserId()).size(); Integer jobReviewCount = appReviewJobMapper.review(SiteSecurityUtils.getUserId(),new MineJobQuery()).size(); Integer fairCollecitonCount = fairCollectionMapper.selectList(Wrappers.lambdaQuery().eq(FairCollection::getUserId, SiteSecurityUtils.getUserId())).size(); + //查询未读消息 + Notice notice=new Notice(); + notice.setUserId(SiteSecurityUtils.getUserId()); + NoticeTotal noticeTotal=noticeMapper.noticTotal(notice); + HashMap map = new HashMap<>(); map.put("applyCount", applyCount); map.put("applyCencalCount", applyCencalCount); map.put("collectionCount", collectionJobCount+collectionCompanyCount); map.put("jobReviewCount", jobReviewCount); map.put("fairCollecitonCount", fairCollecitonCount); + map.put("unreadNoticeCount", noticeTotal.getWdxx()); return map; }