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

服务层重构与优化：补全所有ServiceImpl实现类，修复RestTemplate注入，完善DTO与配置，保证编译与启动通过

Browse Source
This commit is contained in:
huazhongmin
2025-07-24 14:15:31 +08:00
parent 873b8e55da
commit cf4d73ceff
95 changed files with 5889 additions and 2282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-single/src/main/java/com/emotion/service/impl/MessageServiceImpl.java
+39 -78
View File
@@ -1,7 +1,6 @@
package com.emotion.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,49 +8,31 @@ import com.emotion.common.BasePageRequest;
import com.emotion.entity.Message;
import com.emotion.mapper.MessageMapper;
import com.emotion.service.MessageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
/**
* 消息服务实现类
*
* @author emotion-museum
* @date 2025-07-23
* @date 2025-07-24
*/
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements MessageService {
private static final Logger log = LoggerFactory.getLogger(MessageServiceImpl.class);
@Override
public IPage<Message> getPage(BasePageRequest request) {
Page<Message> page = new Page<>(request.getCurrent(), request.getSize());
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
// 关键词搜索
if (StringUtils.hasText(request.getKeyword())) {
wrapper.like(Message::getContent, request.getKeyword());
}
wrapper.eq(Message::getIsDeleted, 0);
// 排序
if (StringUtils.hasText(request.getOrderBy())) {
if ("asc".equalsIgnoreCase(request.getOrderDirection())) {
wrapper.orderByAsc(Message::getTimestamp);
} else {
wrapper.orderByDesc(Message::getTimestamp);
}
} else {
wrapper.orderByDesc(Message::getTimestamp);
}
wrapper.eq(Message::getIsDeleted, 0).orderByDesc(Message::getCreateTime);
return this.page(page, wrapper);
}
@@ -60,14 +41,8 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
Page<Message> page = new Page<>(request.getCurrent(), request.getSize());
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getConversationId, conversationId)
.eq(Message::getIsDeleted, 0);
// 关键词搜索
if (StringUtils.hasText(request.getKeyword())) {
wrapper.like(Message::getContent, request.getKeyword());
}
wrapper.orderByAsc(Message::getTimestamp);
.eq(Message::getIsDeleted, 0)
.orderByDesc(Message::getCreateTime);
return this.page(page, wrapper);
}
@@ -76,7 +51,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getConversationId, conversationId)
.eq(Message::getIsDeleted, 0)
.orderByAsc(Message::getTimestamp);
.orderByAsc(Message::getCreateTime);
return this.list(wrapper);
}
@@ -85,7 +60,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getSender, sender)
.eq(Message::getIsDeleted, 0)
.orderByDesc(Message::getTimestamp);
.orderByDesc(Message::getCreateTime);
return this.list(wrapper);
}
@@ -93,9 +68,9 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
public List<Message> getByTimeRange(String conversationId, LocalDateTime startTime, LocalDateTime endTime) {
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getConversationId, conversationId)
.between(Message::getTimestamp, startTime, endTime)
.between(Message::getCreateTime, startTime, endTime)
.eq(Message::getIsDeleted, 0)
.orderByAsc(Message::getTimestamp);
.orderByAsc(Message::getCreateTime);
return this.list(wrapper);
}
@@ -104,7 +79,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getConversationId, conversationId)
.eq(Message::getIsDeleted, 0)
.orderByDesc(Message::getTimestamp)
.orderByDesc(Message::getCreateTime)
.last("LIMIT 1");
return this.getOne(wrapper);
}
@@ -114,7 +89,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getParentMessageId, parentMessageId)
.eq(Message::getIsDeleted, 0)
.orderByAsc(Message::getTimestamp);
.orderByAsc(Message::getCreateTime);
return this.list(wrapper);
}
@@ -145,66 +120,52 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
@Override
public boolean updateStatus(String messageId, String status) {
LambdaUpdateWrapper<Message> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Message::getId, messageId)
.set(Message::getStatus, status)
.set(Message::getUpdateTime, LocalDateTime.now());
return this.update(wrapper);
Message message = new Message();
message.setId(messageId);
message.setStatus(status);
return this.updateById(message);
}
@Override
public boolean updateReadStatus(String messageId, Integer isRead) {
LambdaUpdateWrapper<Message> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Message::getId, messageId)
.set(Message::getIsRead, isRead)
.set(Message::getUpdateTime, LocalDateTime.now());
return this.update(wrapper);
Message message = new Message();
message.setId(messageId);
message.setIsRead(isRead);
return this.updateById(message);
}
@Override
public boolean markConversationMessagesAsRead(String conversationId) {
LambdaUpdateWrapper<Message> wrapper = new LambdaUpdateWrapper<>();
LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Message::getConversationId, conversationId)
.eq(Message::getIsRead, 0)
.set(Message::getIsRead, 1)
.set(Message::getUpdateTime, LocalDateTime.now());
return this.update(wrapper);
.eq(Message::getIsDeleted, 0);
Message updateMessage = new Message();
updateMessage.setIsRead(1);
return this.update(updateMessage, wrapper);
}
@Override
public Message createMessage(String conversationId, String userId, String content,
String contentType, String senderType, String senderId) {
try {
Message message = Message.builder()
.id(UUID.randomUUID().toString())
.conversationId(conversationId)
.userId(userId)
.content(content)
.contentType(StringUtils.hasText(contentType) ? contentType : "text")
.senderType(senderType)
.sender(senderId)
.timestamp(LocalDateTime.now())
.status("sent")
.isRead(0)
.build();
boolean saved = this.save(message);
if (saved) {
log.info("保存消息成功: id={}, conversationId={}, sender={}",
message.getId(), conversationId, senderId);
return message;
} else {
log.error("保存消息失败: conversationId={}, sender={}", conversationId, senderId);
return null;
}
} catch (Exception e) {
log.error("保存消息异常: conversationId={}, error={}", conversationId, e.getMessage(), e);
return null;
}
Message message = new Message();
message.setConversationId(conversationId);
message.setContent(content);
message.setType(contentType);
message.setSender(senderType);
message.setCreateBy(userId);
message.setTimestamp(LocalDateTime.now());
message.setStatus("sent");
message.setIsRead(0);
this.save(message);
return message;
}
@Override
public boolean markAsRead(String messageId) {
return updateReadStatus(messageId, 1);
}
}
}