From caa46d0a6fcb923ab045cd7567870fad06abc6b3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 29 Apr 2021 15:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E5=90=A7=E9=80=9A=E7=9F=A5=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=8E=E9=98=85=E8=AF=BB=E6=94=BE=E5=9C=A8=E4=B8=80=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/notice/form/NoticeDetailFormDTO.java | 5 ----- .../epmet/modules/notice/controller/NoticeController.java | 3 +-- .../notice/controller/NoticeReadRecordController.java | 5 +++++ .../notice/service/impl/NoticeReadRecordServiceImpl.java | 4 ++-- .../modules/notice/service/impl/NoticeServiceImpl.java | 6 ------ 5 files changed, 8 insertions(+), 15 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 dc1b79f935..c9a57033b1 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,10 +17,5 @@ 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 e18d71970c..1f4d37d1df 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,9 +92,8 @@ public class NoticeController { * @Description 小组通知详情 **/ @PostMapping(value = "noticedetail") - public Result noticeDetail(@LoginUser TokenDto tokenDto, @RequestBody NoticeDetailFormDTO formDTO){ + public Result noticeDetail(@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/controller/NoticeReadRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java index 7be5648a82..e4c5cab55a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java @@ -18,6 +18,7 @@ package com.epmet.modules.notice.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -66,11 +67,15 @@ public class NoticeReadRecordController { * @return * @Author sun * @Description 小组通知阅读状态修改 + * 只给居民端使用 **/ @PostMapping(value = "readtype") public Result readType(@LoginUser TokenDto tokenDto, @RequestBody ReadTypeFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, ReadTypeFormDTO.Read.class); formDTO.setUserId(tokenDto.getUserId()); + if(!"resi".equals(tokenDto.getApp())){ + throw new RenException(String.format("接口仅用于居民端使用，请检查用户是否为居民端用户，userId->", formDTO.getUserId())); + } noticeReafdRecordService.readType(formDTO); return new Result(); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java index d4025dcd6f..316a2a81ff 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java @@ -165,13 +165,13 @@ public class NoticeReadRecordServiceImpl 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; }