|
@@ -3,20 +3,18 @@ package thyyxxk.webserver.service.socketmessage;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
|
import thyyxxk.webserver.dao.his.socketmessage.SocketMessageDao;
|
|
|
import thyyxxk.webserver.entity.ResultVo;
|
|
|
-import thyyxxk.webserver.entity.dictionary.PureCodeName;
|
|
|
import thyyxxk.webserver.entity.socketmessage.MessageIndex;
|
|
|
import thyyxxk.webserver.entity.socketmessage.SocketMessage;
|
|
|
+import thyyxxk.webserver.entity.socketmessage.SystemMessage;
|
|
|
import thyyxxk.webserver.service.redislike.RedisLikeService;
|
|
|
-import thyyxxk.webserver.utils.FilterUtil;
|
|
|
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
|
|
@@ -30,16 +28,17 @@ public class SocketMessageService {
|
|
|
this.redis = redis;
|
|
|
}
|
|
|
|
|
|
- public ResultVo<Map<String, Object>> onPageRefresh(List<Integer> excludes) {
|
|
|
- if (excludes.isEmpty()) {
|
|
|
- excludes.add(0);
|
|
|
+ public ResultVo<List<SystemMessage>> selectSystemMessages(String date) {
|
|
|
+ date = date.equals("latest") ? dao.selectLatestDate() : dao.selectLastDate(date);
|
|
|
+ List<SystemMessage> list = dao.selectMessagesByDate(date);
|
|
|
+ if (null == list || list.isEmpty()) {
|
|
|
+ return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "已经到顶了,无法找到更多的内容。");
|
|
|
}
|
|
|
- List<SocketMessage> systemMessages = dao.selectImportantSystemMessages(excludes);
|
|
|
- int unreadCount = dao.selectUnreadCount(TokenUtil.getTokenUserId());
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("systemMessage", systemMessages);
|
|
|
- map.put("unreadCount", unreadCount);
|
|
|
- return ResultVoUtil.success(map);
|
|
|
+ return ResultVoUtil.success(list);
|
|
|
+ }
|
|
|
+
|
|
|
+ public ResultVo<Integer> fetchUnreadCount() {
|
|
|
+ return ResultVoUtil.success(dao.selectUnreadCount(TokenUtil.getTokenUserId()));
|
|
|
}
|
|
|
|
|
|
public ResultVo<List<MessageIndex>> fetchAllSenders() {
|
|
@@ -62,7 +61,8 @@ public class SocketMessageService {
|
|
|
return ResultVoUtil.success(dao.selectAllSystemMessages());
|
|
|
}
|
|
|
String receiver = TokenUtil.getTokenUserId();
|
|
|
+ List<SocketMessage> list = dao.selectNeededMessages(sender, receiver);
|
|
|
dao.updateReadStatus(sender, receiver);
|
|
|
- return ResultVoUtil.success(dao.selectNeededMessages(sender, receiver));
|
|
|
+ return ResultVoUtil.success(list);
|
|
|
}
|
|
|
}
|