peanut/happy-life-star
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
huazhongmin
2025-09-09 11:13:36 +08:00
parent cf50a9f1fa
commit fcd35c78e5
60 changed files with 2753 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-single/src/main/java/com/emotion/service/impl/MessageServiceImpl.java
+100 -21
View File
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
* 消息服务实现类
*
* @author emotion-museum
* @date 2025-07-24
* @date 2025-09-08
*/
@Slf4j
@Service
@@ -50,6 +50,16 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
return this.page(page, wrapper);
}
@Override
public PageResult<MessageResponse> getPageWithResponse(MessagePageRequest request) {
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
// 调用用户消息分页查询方法
PageResult<MessageResponse> pageResult = getUserMessagesWithPage(request);
return pageResult;
}
@Override
public IPage<Message> getPageByConversationId(BasePageRequest request, String conversationId) {
Page<Message> page = new Page<>(request.getCurrent(), request.getSize());
@@ -218,18 +228,13 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public PageResult<MessageResponse> getUserMessagesWithPage(MessagePageRequest request) {
log.info("获取用户消息分页: current={}, size={}", request.getCurrent(), request.getSize());
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
log.info("当前用户ID: {}", userId);
// 调用原有的分页查询方法
IPage<Message> page = getByUserIdWithPage(userId, Math.toIntExact(request.getCurrent()),
Math.toIntExact(request.getSize()));
log.info("查询结果: total={}, records={}", page.getTotal(), page.getRecords().size());
// 转换为响应对象
List<MessageResponse> responses = page.getRecords().stream()
.map(this::convertToResponse)
@@ -248,15 +253,11 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public List<MessageResponse> searchUserMessages(MessageSearchRequest request) {
log.info("搜索用户消息: keyword={}, limit={}", request.getKeyword(), request.getLimit());
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
log.info("当前用户ID: {}", userId);
// 调用原有的搜索方法
List<Message> messages = searchByUserIdAndKeyword(userId, request.getKeyword(), request.getLimit());
log.info("搜索结果: {} 条消息", messages.size());
// 转换为响应对象
return messages.stream()
@@ -266,15 +267,11 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public List<MessageResponse> getUserRecentMessages(MessageRecentRequest request) {
log.info("获取用户最近消息: limit={}", request.getLimit());
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
log.info("当前用户ID: {}", userId);
// 调用原有的获取最近消息方法
List<Message> messages = getRecentByUserId(userId, request.getLimit());
log.info("查询结果: {} 条最近消息", messages.size());
// 转换为响应对象
return messages.stream()
@@ -284,11 +281,8 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public MessageResponse createMessageFromRequest(MessageCreateRequest request) {
log.info("根据请求创建消息: conversationId={}", request.getConversationId());
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
log.info("当前用户ID: {}", userId);
// 构建消息对象
Message message = new Message();
@@ -300,7 +294,6 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
// 调用原有的创建方法
Message savedMessage = createMessage(message);
log.info("创建消息成功: messageId={}", savedMessage.getId());
// 转换为响应对象
return convertToResponse(savedMessage);
@@ -308,11 +301,8 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public MessageResponse getMessageById(String id) {
log.info("根据ID获取消息: id={}", id);
Message message = getById(id);
if (message == null) {
log.warn("消息不存在: id={}", id);
return null;
}
@@ -320,6 +310,95 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
return convertToResponse(message);
}
@Override
public PageResult<MessageResponse> searchWithResponse(MessageSearchRequest request) {
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
// 构建分页对象
Page<Message> page = new Page<>(1L, request.getLimit().longValue());
// 调用搜索方法
List<Message> messages = searchByUserIdAndKeyword(userId, request.getKeyword(), request.getLimit());
// 设置分页信息
page.setRecords(messages);
page.setTotal(messages.size());
// 转换为响应对象
List<MessageResponse> responses = messages.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
// 构建分页结果
PageResult<MessageResponse> pageResult = new PageResult<>();
pageResult.setRecords(responses);
pageResult.setCurrent(page.getCurrent());
pageResult.setSize(page.getSize());
pageResult.setTotal(page.getTotal());
pageResult.setPages(page.getPages());
return pageResult;
}
@Override
public PageResult<MessageResponse> getRecentWithResponse(MessageRecentRequest request) {
// 从上下文中获取当前用户ID
String userId = CurrentUserUtil.requireCurrentUserId();
// 构建分页对象
Page<Message> page = new Page<>(1L, request.getLimit().longValue());
// 调用获取最近消息方法
List<Message> messages = getRecentByUserId(userId, request.getLimit());
// 设置分页信息
page.setRecords(messages);
page.setTotal(messages.size());
// 转换为响应对象
List<MessageResponse> responses = messages.stream()
.map(this::convertToResponse)
.collect(Collectors.toList());
// 构建分页结果
PageResult<MessageResponse> pageResult = new PageResult<>();
pageResult.setRecords(responses);
pageResult.setCurrent(page.getCurrent());
pageResult.setSize(page.getSize());
pageResult.setTotal(page.getTotal());
pageResult.setPages(page.getPages());
return pageResult;
}
@Override
public MessageResponse updateMessage(String id, String content) {
Message message = this.getById(id);
if (message == null || message.getIsDeleted() == 1) {
return null;
}
// 更新内容
message.setContent(content);
this.updateById(message);
// 转换为响应对象
return convertToResponse(message);
}
@Override
public boolean deleteMessage(String id) {
Message message = this.getById(id);
if (message == null || message.getIsDeleted() == 1) {
return false;
}
// 逻辑删除
message.setIsDeleted(1);
return this.updateById(message);
}
/**
* 转换为响应对象
*/