From cd47bb5a3624b8d7e47dba84d74dec6876062c63 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Apr 2021 14:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=9A=E7=9F=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=97=B6=E4=BF=AE=E6=94=B9=E9=98=85=E8=AF=BB=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/notice/form/NoticeDetailFormDTO.java | 5 +++++ .../modules/notice/controller/NoticeController.java | 3 ++- .../notice/service/impl/NoticeServiceImpl.java | 13 +++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java index c9a57033b1..dc1b79f935 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java @@ -17,5 +17,10 @@ public class NoticeDetailFormDTO { @NotBlank(message = "通知Id不能为空",groups = {NoticeDetailFormDTO.Detail.class}) private String noticeId; + /** + * token中用户Id + */ + private String userId; + public interface Detail{} } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java index 1f4d37d1df..e18d71970c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeController.java @@ -92,8 +92,9 @@ public class NoticeController { * @Description 小组通知详情 **/ @PostMapping(value = "noticedetail") - public Result noticeDetail(@RequestBody NoticeDetailFormDTO formDTO){ + public Result noticeDetail(@LoginUser TokenDto tokenDto, @RequestBody NoticeDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, NoticeDetailFormDTO.Detail.class); + formDTO.setUserId(tokenDto.getUserId()); return new Result().ok(noticeService.noticeDetail(formDTO)); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 39d4d9033e..c78dc30bc5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java @@ -57,10 +57,7 @@ import com.epmet.modules.notice.service.NoticeService; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.notice.NoticeDTO; -import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO; -import com.epmet.resi.group.dto.notice.form.EditNoticeFormDTO; -import com.epmet.resi.group.dto.notice.form.NoticeDetailFormDTO; -import com.epmet.resi.group.dto.notice.form.NoticeFileDTO; +import com.epmet.resi.group.dto.notice.form.*; import com.epmet.resi.group.dto.notice.result.NoticeDetailResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -115,6 +112,8 @@ public class NoticeServiceImpl extends BaseServiceImpl private NoticeReadRecordDao noticeReadRecordDao; @Autowired private GroupMessageDao groupMessageDao; + @Autowired + private NoticeReadRecordService noticeReadRecordService; @Override @@ -495,6 +494,12 @@ public class NoticeServiceImpl extends BaseServiceImpl resultDTO.setImageList(imageList); resultDTO.setDocList(docList); + //5.修改当前人员对通知的阅读状态 + ReadTypeFormDTO readType = new ReadTypeFormDTO(); + readType.setNoticeId(formDTO.getNoticeId()); + readType.setUserId(formDTO.getUserId()); + noticeReadRecordService.readType(readType); + return resultDTO; }