|
@@ -14,7 +14,9 @@ import thyyxxk.webserver.utils.ResultVoUtil;
|
|
|
import thyyxxk.webserver.utils.TokenUtil;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Service
|
|
|
@Slf4j
|
|
@@ -37,8 +39,16 @@ public class SocketMessageService {
|
|
|
return ResultVoUtil.success(list);
|
|
|
}
|
|
|
|
|
|
- public ResultVo<Integer> fetchUnreadCount() {
|
|
|
- return ResultVoUtil.success(dao.selectUnreadCount(TokenUtil.getTokenUserId()));
|
|
|
+ public ResultVo<Map<String, Object>> onPageRefresh(List<String> exclude) {
|
|
|
+ if (exclude.isEmpty()) {
|
|
|
+ exclude.add("0");
|
|
|
+ }
|
|
|
+ List<SystemMessage> systemMessages = dao.selectImportantSystemMessages(exclude);
|
|
|
+ int unreadCount = dao.selectUnreadCount(TokenUtil.getTokenUserId());
|
|
|
+ Map<String, Object> resultMap = new HashMap<>();
|
|
|
+ resultMap.put("systemMessage", systemMessages);
|
|
|
+ resultMap.put("unreadCount", unreadCount);
|
|
|
+ return ResultVoUtil.success(resultMap);
|
|
|
}
|
|
|
|
|
|
public ResultVo<List<MessageIndex>> fetchAllSenders() {
|