diff --git a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java index 0172fa53..c611c74a 100644 --- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java +++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java @@ -56,6 +56,12 @@ public class ChatRequest { */ private Long userId; + + /** + * 会话id + */ + private Long sessionId; + /** * 应用ID */ diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java index 691f98f0..a139b7bf 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java @@ -34,6 +34,11 @@ public class ChatMessage extends BaseEntity { */ private Long userId; + /** + * 会话id + */ + private Long sessionId; + /** * 消息内容 */ diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java new file mode 100644 index 00000000..32711412 --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatSession.java @@ -0,0 +1,51 @@ +package org.ruoyi.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.ruoyi.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 会话管理对象 chat_session + * + * @author ageerle + * @date 2025-05-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("chat_session") +public class ChatSession extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 会话标题 + */ + private String sessionTitle; + + /** + * 会话内容 + */ + private String sessionContent; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java index 484d0415..012d5268 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java @@ -40,6 +40,11 @@ public class ChatMessageBo extends BaseEntity { @NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class }) private String content; + /** + * 会话id + */ + private Long sessionId; + /** * 对话角色 */ diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java new file mode 100644 index 00000000..a6b23ba2 --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatSessionBo.java @@ -0,0 +1,54 @@ +package org.ruoyi.domain.bo; + +import org.ruoyi.common.core.validate.AddGroup; +import org.ruoyi.common.core.validate.EditGroup; +import org.ruoyi.core.domain.BaseEntity; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.ruoyi.domain.ChatSession; + +/** + * 会话管理业务对象 chat_session + * + * @author ageerle + * @date 2025-05-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ChatSession.class, reverseConvertGenerate = false) +public class ChatSessionBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 会话标题 + */ + @NotBlank(message = "会话标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sessionTitle; + + /** + * 会话内容 + */ + @NotBlank(message = "会话内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sessionContent; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java index 501a1b6d..23d092a1 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java @@ -41,6 +41,11 @@ public class ChatMessageVo implements Serializable { @ExcelProperty(value = "用户id") private Long userId; + /** + * 会话id + */ + private Long sessionId; + /** * 消息内容 */ diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java new file mode 100644 index 00000000..2a25f5c1 --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatSessionVo.java @@ -0,0 +1,59 @@ +package org.ruoyi.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.ruoyi.domain.ChatSession; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 会话管理视图对象 chat_session + * + * @author ageerle + * @date 2025-05-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ChatSession.class) +public class ChatSessionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 会话标题 + */ + @ExcelProperty(value = "会话标题") + private String sessionTitle; + + /** + * 会话内容 + */ + @ExcelProperty(value = "会话内容") + private String sessionContent; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/mapper/ChatSessionMapper.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/mapper/ChatSessionMapper.java new file mode 100644 index 00000000..7833fdcd --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/mapper/ChatSessionMapper.java @@ -0,0 +1,15 @@ +package org.ruoyi.mapper; + +import org.ruoyi.core.mapper.BaseMapperPlus; +import org.ruoyi.domain.ChatSession; +import org.ruoyi.domain.vo.ChatSessionVo; + +/** + * 会话管理Mapper接口 + * + * @author ageerle + * @date 2025-05-03 + */ +public interface ChatSessionMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatSessionService.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatSessionService.java new file mode 100644 index 00000000..3ce60ad7 --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatSessionService.java @@ -0,0 +1,48 @@ +package org.ruoyi.service; + +import org.ruoyi.core.page.PageQuery; +import org.ruoyi.core.page.TableDataInfo; +import org.ruoyi.domain.bo.ChatSessionBo; +import org.ruoyi.domain.vo.ChatSessionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 会话管理Service接口 + * + * @author ageerle + * @date 2025-05-03 + */ +public interface IChatSessionService { + + /** + * 查询会话管理 + */ + ChatSessionVo queryById(Long id); + + /** + * 查询会话管理列表 + */ + TableDataInfo queryPageList(ChatSessionBo bo, PageQuery pageQuery); + + /** + * 查询会话管理列表 + */ + List queryList(ChatSessionBo bo); + + /** + * 新增会话管理 + */ + Boolean insertByBo(ChatSessionBo bo); + + /** + * 修改会话管理 + */ + Boolean updateByBo(ChatSessionBo bo); + + /** + * 校验并批量删除会话管理信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatSessionServiceImpl.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatSessionServiceImpl.java new file mode 100644 index 00000000..247de45b --- /dev/null +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatSessionServiceImpl.java @@ -0,0 +1,111 @@ +package org.ruoyi.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.ruoyi.common.core.utils.MapstructUtils; +import org.ruoyi.common.core.utils.StringUtils; +import org.ruoyi.core.page.TableDataInfo; +import org.ruoyi.core.page.PageQuery; +import lombok.RequiredArgsConstructor; +import org.ruoyi.domain.ChatSession; +import org.ruoyi.domain.bo.ChatSessionBo; +import org.ruoyi.domain.vo.ChatSessionVo; +import org.ruoyi.mapper.ChatSessionMapper; +import org.ruoyi.service.IChatSessionService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 会话管理Service业务层处理 + * + * @author ageerle + * @date 2025-05-03 + */ +@RequiredArgsConstructor +@Service +public class ChatSessionServiceImpl implements IChatSessionService { + + private final ChatSessionMapper baseMapper; + + /** + * 查询会话管理 + */ + @Override + public ChatSessionVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询会话管理列表 + */ + @Override + public TableDataInfo queryPageList(ChatSessionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询会话管理列表 + */ + @Override + public List queryList(ChatSessionBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ChatSessionBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, ChatSession::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getSessionTitle()), ChatSession::getSessionTitle, bo.getSessionTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getSessionContent()), ChatSession::getSessionContent, bo.getSessionContent()); + return lqw; + } + + /** + * 新增会话管理 + */ + @Override + public Boolean insertByBo(ChatSessionBo bo) { + ChatSession add = MapstructUtils.convert(bo, ChatSession.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改会话管理 + */ + @Override + public Boolean updateByBo(ChatSessionBo bo) { + ChatSession update = MapstructUtils.convert(bo, ChatSession.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ChatSession entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除会话管理 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java index 2a4e5f09..be990442 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java @@ -46,6 +46,7 @@ public class ChatCostServiceImpl implements IChatCostService { /** * 扣除用户余额 */ + @Override public void deductToken(ChatRequest chatRequest) { int tokens = TikTokensUtil.tokens(chatRequest.getModel(), chatRequest.getPrompt()); @@ -53,6 +54,7 @@ public class ChatCostServiceImpl implements IChatCostService { String modelName = chatRequest.getModel(); ChatMessageBo chatMessageBo = new ChatMessageBo(); + chatMessageBo.setSessionId(chatRequest.getSessionId()); Object userId = LocalCache.CACHE.get("userId"); if(userId!=null){ diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java index b6759f57..ccf9f3a2 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java @@ -24,9 +24,12 @@ import org.ruoyi.common.core.utils.StringUtils; import org.ruoyi.common.core.utils.file.FileUtils; import org.ruoyi.common.core.utils.file.MimeTypeUtils; import org.ruoyi.common.redis.utils.RedisUtils; +import org.ruoyi.domain.ChatSession; +import org.ruoyi.domain.bo.ChatSessionBo; import org.ruoyi.domain.vo.ChatModelVo; import org.ruoyi.service.EmbeddingService; import org.ruoyi.service.IChatModelService; +import org.ruoyi.service.IChatSessionService; import org.ruoyi.service.VectorStoreService; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; @@ -65,6 +68,8 @@ public class SseServiceImpl implements ISseService { private final OllamaServiceImpl ollamaService; + private final IChatSessionService chatSessionService; + private ChatModelVo chatModelVo; @@ -80,6 +85,15 @@ public class SseServiceImpl implements ISseService { }else { LocalCache.CACHE.put("userId", chatCostService.getUserId()); chatRequest.setUserId(chatCostService.getUserId()); + // 保存会话信息 + if(chatRequest.getSessionId()==null){ + ChatSessionBo chatSessionBo = new ChatSessionBo(); + chatSessionBo.setUserId(chatCostService.getUserId()); + chatSessionBo.setSessionTitle(getFirst10Characters(chatRequest.getPrompt())); + chatSessionBo.setSessionContent(chatRequest.getPrompt()); + chatSessionService.insertByBo(chatSessionBo); + chatRequest.setSessionId(chatSessionBo.getId()); + } // 保存消息记录 并扣除费用 chatCostService.deductToken(chatRequest); } @@ -92,6 +106,23 @@ public class SseServiceImpl implements ISseService { return sseEmitter; } + /** + * 获取对话标题 + * + * @param str 原字符 + * @return 截取后的字符 + */ + public static String getFirst10Characters(String str) { + // 判断字符串长度 + if (str.length() > 10) { + // 如果长度大于10，截取前10个字符 + return str.substring(0, 10); + } else { + // 如果长度不足10，返回整个字符串 + return str; + } + } + /** * 检查未登录用户是否超过当日对话次数限制 *