From 8bbc66e7fff2b21cc0358636233f3285938d6ace Mon Sep 17 00:00:00 2001 From: sh Date: Thu, 6 Nov 2025 11:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AA=E8=AF=BB=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=88=97=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cms/CmsNoticeController.java | 26 ++++++++++++++++--- .../cms/EmployeeConfirmController.java | 8 +++--- .../java/com/ruoyi/cms/domain/Notice.java | 2 +- .../ruoyi/cms/service/IAppNoticeService.java | 2 ++ .../service/impl/AppNoticeServiceImpl.java | 8 +++++- .../impl/EmployeeConfirmServiceImpl.java | 11 ++++++++ 6 files changed, 48 insertions(+), 9 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java index ca68ca6..9a604c5 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java @@ -92,10 +92,30 @@ public class CmsNoticeController extends BaseController return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } - - @ApiOperation("pc端获取未读消息") + @ApiOperation("pc端获取消息列表") @GetMapping("/appNoticList") - public TableDataInfo list(Notice notice) + public TableDataInfo selectListAppNotics(Notice notice) + { + if(!SecurityUtils.isLogin()){ + error(HttpStatus.ERROR,"未登录!"); + } + if(notice.getUserId()==null){ + String idCard= RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard); + if(appUser==null){ + error(HttpStatus.ERROR,"用户信息未完善,请完善身份证信息!"); + }else{ + notice.setUserId(appUser.getUserId()); + } + } + startPage(); + List notices = noticeService.selectListAppNotics(notice); + return getDataTable(notices); + } + + @ApiOperation("pc端获取未读消息列表") + @GetMapping("/appNoticReadList") + public TableDataInfo appNoticReadList(Notice notice) { if(!SecurityUtils.isLogin()){ error(HttpStatus.ERROR,"未登录!"); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java index a24e5d8..1d5ae64 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java @@ -34,7 +34,7 @@ public class EmployeeConfirmController extends BaseController { * 列表 */ @ApiOperation("新入职员工确认信息列表") - @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')") +// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')") @RequestMapping("/list") public TableDataInfo list(EmployeeConfirm employeeConfirm){ List list=employeeConfirmService.getEmployeeConfirmList(employeeConfirm); @@ -45,7 +45,7 @@ public class EmployeeConfirmController extends BaseController { * 保存 */ @ApiOperation("新增新入职员工确认信息") - @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')") +// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')") @Log(title = "职员工确认信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EmployeeConfirm employeeConfirm){ @@ -53,7 +53,7 @@ public class EmployeeConfirmController extends BaseController { } @ApiOperation("修改新入职员工确认信息") - @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')") +// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')") @Log(title = "职员工确认信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EmployeeConfirm employeeConfirm){ @@ -61,7 +61,7 @@ public class EmployeeConfirmController extends BaseController { } @ApiOperation("删除新入职员工确认信息") - @PreAuthorize("@ss.hasPermi('app:employeeConfirm:remove')") +// @PreAuthorize("@ss.hasPermi('app:employeeConfirm:remove')") @Log(title = "公司", businessType = BusinessType.DELETE) @DeleteMapping("/{employeeConfirmIds}") public AjaxResult remove(@PathVariable Long[] employeeConfirmIds) 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 1ac25f6..f58ea7a 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 @@ -30,7 +30,7 @@ public class Notice extends BaseEntity @ApiModelProperty("未读数量") private Integer notReadCount; - @ApiModelProperty("是否阅读") + @ApiModelProperty("是否阅读 0未读 1已读") private Integer isRead; @JsonFormat(pattern = "MM-dd") 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 9e368c7..c8e2d1c 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 @@ -80,4 +80,6 @@ public interface IAppNoticeService List selectListAppNotRead(Notice notice); void readSysNotices(String ids,Long userId); + + List selectListAppNotics(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 4687d13..bf2ea71 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 @@ -201,7 +201,7 @@ 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").orderByDesc(Notice::getCreateTime)); + 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; } @@ -221,5 +221,11 @@ public class AppNoticeServiceImpl implements IAppNoticeService } 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; + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java index 45b8029..cf7382f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java @@ -2,8 +2,10 @@ package com.ruoyi.cms.service.impl; import com.ruoyi.cms.domain.EmployeeConfirm; import com.ruoyi.cms.domain.JobApply; +import com.ruoyi.cms.domain.Notice; import com.ruoyi.cms.mapper.EmployeeConfirmMapper; import com.ruoyi.cms.mapper.JobApplyMapper; +import com.ruoyi.cms.mapper.NoticeMapper; import com.ruoyi.cms.service.EmployeeConfirmService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,6 +21,8 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService { EmployeeConfirmMapper employeeConfirmMapper; @Autowired private JobApplyMapper jobApplyMapper; + @Autowired + private NoticeMapper noticeMapper; @Override public List getEmployeeConfirmList(EmployeeConfirm employeeConfirm) { @@ -34,6 +38,13 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService { apply.setHire("0"); jobApplyMapper.updateById(apply); } + //添加消息 + /*Notice notice=new Notice(); + notice.setUserId(); + notice.setBussinessId(); + notice.setIsRead(0); + notice + noticeMapper.insert(notice);*/ return t; }