wip: 通知公告开发临时提交

通知公告开发临时提交

src/main/java/com/youlai/boot/system/service/NoticeService.java

@@ -6,6 +6,7 @@ import com.youlai.boot.system.model.entity.Notice;
 import com.youlai.boot.system.model.form.NoticeForm;
 import com.youlai.boot.system.model.query.NoticeQuery;
 import com.youlai.boot.system.model.vo.NoticeVO;
+import com.youlai.boot.system.model.vo.NoticeDetailVO;
 
 /**
  * 通知公告服务类
@@ -70,4 +71,19 @@ public interface NoticeService extends IService<Notice> {
      * @return 是否撤回成功
      */
     boolean recallNotice(Long id);
+
+    /**
+     * 阅读通知公告
+     *
+     * @param id 通知公告ID
+     * @return 通知公告对象
+     */
+    NoticeDetailVO readNotice(Long id);
+
+    /**
+     * 获取阅读时通知公告详情
+     * @param id 通知公告ID
+     * @return 通知公告详情
+     */
+    NoticeDetailVO getReadNoticeDetail(Long id);
 }

src/main/java/com/youlai/boot/system/service/NoticeStatusService.java

@@ -1,7 +1,6 @@
 package com.youlai.boot.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.entity.NoticeStatus;
 import com.youlai.boot.system.model.vo.NoticeStatusVO;
 
@@ -15,5 +14,15 @@ import java.util.List;
  */
 public interface NoticeStatusService extends IService<NoticeStatus> {
 
-    List<NoticeStatusVO> listNotices(Integer count);
+    /**
+     * 获取未读的通知公告
+     * @return 公告列表
+     */
+    List<NoticeStatusVO> listUnreadNotices();
+
+    /**
+     * 全部标记为已读
+     * @return 是否成功
+     */
+    boolean readAll();
 }

src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java

@@ -21,6 +21,7 @@ import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.form.NoticeForm;
 import com.youlai.boot.system.model.query.NoticeQuery;
 import com.youlai.boot.system.model.vo.NoticeVO;
+import com.youlai.boot.system.model.vo.NoticeDetailVO;
 import com.youlai.boot.system.service.NoticeService;
 import com.youlai.boot.system.service.NoticeStatusService;
 import com.youlai.boot.system.service.UserService;
@@ -225,4 +226,41 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
         return true;
     }
 
+    /**
+     * 阅读通知公告
+     * @param id 通知公告ID
+     * @return 通知公告表单对象
+     */
+    @Override
+    public NoticeDetailVO readNotice(Long id) {
+        NoticeDetailVO noticeDetailVO = this.getReadNoticeDetail(id);
+        Assert.isTrue(noticeDetailVO != null && noticeDetailVO.getReleaseStatus() == 1, "公告不存在或未发布");
+        //获取当前登录用户
+        Long userId = SecurityUtils.getUserId();
+        LambdaQueryWrapper<NoticeStatus> queryWrapper = new LambdaQueryWrapper<NoticeStatus>()
+                .eq(NoticeStatus::getUserId, userId)
+                .eq(NoticeStatus::getNoticeId, id)
+                .eq(NoticeStatus::getReadStatus, 0);
+        NoticeStatus noticeStatus = noticeStatusService.getOne(queryWrapper);
+        if (noticeStatus != null) {
+            noticeStatus.setReadStatus(1);
+            noticeStatusService.updateById(noticeStatus);
+        }
+        return noticeDetailVO;
+    }
+
+    /**
+     * 获取阅读时通知公告详情
+     * @param id 通知公告ID
+     * @return
+     */
+    @Override
+    public NoticeDetailVO getReadNoticeDetail(Long id) {
+        Assert.notNull(id, "公告ID不能为空");
+        NoticeDetailVO noticeDetailVO = this.baseMapper.getReadNoticeVO(id);
+        Assert.isTrue(noticeDetailVO != null, "公告不存在");
+        return noticeDetailVO;
+    }
+
+
 }

src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java

@@ -1,12 +1,11 @@
 package com.youlai.boot.system.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.common.result.Result;
+import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.system.mapper.NoticeStatusMapper;
 import com.youlai.boot.system.model.entity.NoticeStatus;
 import com.youlai.boot.system.model.vo.NoticeStatusVO;
-import com.youlai.boot.system.service.NoticeService;
 import com.youlai.boot.system.service.NoticeStatusService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -23,13 +22,31 @@ import java.util.List;
 @RequiredArgsConstructor
 public class NoticeStatusServiceImpl extends ServiceImpl<NoticeStatusMapper, NoticeStatus> implements NoticeStatusService {
 
-    private final NoticeService noticeService;
+    private final NoticeStatusMapper noticeStatusMapper;
 
+    /**
+     * 获取未读的通知公告
+     * @return 公告列表
+     */
     @Override
-    public List<NoticeStatusVO> listNotices(Integer count) {
-        LambdaQueryWrapper<NoticeStatus> queryWrapper =  new LambdaQueryWrapper<>();
-        //获取当前用户
-        queryWrapper.eq(NoticeStatus::getUserId, 1L);
-        return null;
+    public List<NoticeStatusVO> listUnreadNotices() {
+        //获取当前登录用户
+        Long userId = SecurityUtils.getUserId();
+        return noticeStatusMapper.listUnreadNotices(userId);
     }
+
+    /**
+     * 全部标记为已读
+     * @return 是否成功
+     */
+    @Override
+    public boolean readAll() {
+        Long userId = SecurityUtils.getUserId();
+        LambdaUpdateWrapper<NoticeStatus> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(NoticeStatus::getUserId, userId);
+        updateWrapper.set(NoticeStatus::getReadStatus, 1);
+        return this.update(updateWrapper);
+    }
+
+
 }