diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java index ff539ec1..32b22f0c 100644 --- a/src/main/java/com/ai/da/common/constant/CommonConstant.java +++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java @@ -59,7 +59,8 @@ public class CommonConstant { public static final List IS_SUBSCRIBE = Arrays.asList("yes", "no"); - public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg"; +// public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg"; + public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.png"; /* 截止至2024/08/26,在Code-Create DB中pmr_users表中最大的用户id */ public static final Long MAXIMUM_USER_ID = 704L; 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 7524c2e4..62cc019d 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -1115,6 +1115,8 @@ public class PortfolioServiceImpl extends ServiceImpl