From 3b159e3c6b3b613d4fa6eec49001538364a0879d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 20 Aug 2021 15:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E3=80=91=E6=88=91=E6=94=B6=E5=88=B0=E3=80=81=E6=88=91=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/result/InfoRedDotResultDTO.java | 26 +++++++++++++++++++ .../dataaggre/controller/InfoController.java | 13 ++++++++++ .../epmetmessage/EpmetMessageService.java | 9 +++++++ .../impl/EpmetMessageServiceImpl.java | 12 +++++++++ 4 files changed, 60 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoRedDotResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoRedDotResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoRedDotResultDTO.java new file mode 100644 index 0000000000..ce159b6a33 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoRedDotResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.message.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/8/20 3:22 下午 + * @DESC + */ +@Data +public class InfoRedDotResultDTO implements Serializable { + + private static final long serialVersionUID = 6417699657069808978L; + + /** + * 我发出的，新回复数量 + */ + private Integer sentNewReplyCount; + + /** + * 我收到的未读的消息数量 + */ + private Integer receivedUnReadCount; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java index 35078415c2..0b9b807162 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java @@ -10,6 +10,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO; import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO; import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO; import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO; +import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO; import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO; import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO; import com.epmet.dataaggre.service.epmetmessage.EpmetMessageService; @@ -92,4 +93,16 @@ public class InfoController { ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); return new Result().ok(epmetMessageService.queryInfoReplies(formDTO)); } + + /** + * @Description 【发送消息】我收到、我发送红点 + * @Param userId + * @author zxc + * @date 2021/8/20 3:38 下午 + */ + @PostMapping("reddot") + public Result redDot(@LoginUser TokenDto tokenDto){ + return new Result().ok(epmetMessageService.redDot(tokenDto.getUserId())); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java index cb48524cfd..43477866a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java @@ -5,6 +5,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO; import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO; import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO; import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO; +import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO; import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO; import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO; @@ -53,4 +54,12 @@ public interface EpmetMessageService { * @date 2021/8/20 2:09 下午 */ InfoReplyResDTO queryInfoReplies(InfoRepliesFormDTO formDTO); + + /** + * @Description 【发送消息】我收到、我发送红点 + * @Param userId + * @author zxc + * @date 2021/8/20 3:38 下午 + */ + InfoRedDotResultDTO redDot(String userId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java index 0e36e842bc..6d1c3ff183 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java @@ -177,6 +177,18 @@ public class EpmetMessageServiceImpl implements EpmetMessageService { return result; } + /** + * @Description 【发送消息】我收到、我发送红点 + * 我发出的查询info_profile限制住created_by=当前用户， sum未读的回复数 + * 我收到的info_receivers，并且未读的 count(distinct info_id) + * @Param userId + * @author zxc + * @date 2021/8/20 3:38 下午 + */ + @Override + public InfoRedDotResultDTO redDot(String userId) { + return null; + } }