diff --git a/src/main/java/com/ai/da/service/MessageCenterService.java b/src/main/java/com/ai/da/service/MessageCenterService.java index 84bb9cd1..50b7574f 100644 --- a/src/main/java/com/ai/da/service/MessageCenterService.java +++ b/src/main/java/com/ai/da/service/MessageCenterService.java @@ -18,6 +18,8 @@ public interface MessageCenterService extends IService { void prePushMessage(Notification notification); + void pushMessage(String type, Long receiverId); + void cancelPushMessage(String type, Long senderId, Long receiverId, Long portfolioId, Long commentId); Boolean setReadStatus(List notificationIdList, String type); diff --git a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java index ff53737e..463df6c0 100644 --- a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java @@ -168,6 +168,7 @@ public class MessageCenterServiceImpl extends ServiceImpl> resp = new ArrayList<>(); HashMap data = new HashMap<>(); Long count; + Long accountId = UserContext.getUserHolder().getId(); if (!type.equals("system")) { // 个人未读消息 count = getUnreadCountByType(type, receiverId); @@ -175,9 +176,19 @@ public class MessageCenterServiceImpl extends ServiceImpl followee = new HashMap<>(); + HashMap follower = new HashMap<>(); + follower.put("followerCount",portfolioService.getFollowerCount(accountId)); + followee.put("followeeCount",portfolioService.getFolloweeCount(accountId)); + resp.add(followee); + resp.add(follower); + } data.put(type, count); - resp.add(data); + if (count != 0){ + resp.add(data); + } String jsonString = JSON.toJSONString(resp); log.info("消息推送 : {}", jsonString); diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index b59a7479..e3949f92 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -1081,6 +1081,8 @@ public class PortfolioServiceImpl extends ServiceImpl