diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java index 069d75a6..b9fa6864 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java @@ -36,7 +36,7 @@ public class ChatModelServiceImpl implements IChatModelService { * 查询聊天模型 */ @Override - public ChatModelVo queryById(Long id){ + public ChatModelVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -103,7 +103,7 @@ public class ChatModelServiceImpl implements IChatModelService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(ChatModel entity){ + private void validEntityBeforeSave(ChatModel entity) { // 判断是否包含*号 if (entity.getApiKey().contains("*")) { // 重新设置key信息 @@ -116,7 +116,7 @@ public class ChatModelServiceImpl implements IChatModelService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteBatchIds(ids) > 0; @@ -129,24 +129,25 @@ public class ChatModelServiceImpl implements IChatModelService { public ChatModelVo selectModelByName(String modelName) { return baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(ChatModel::getModelName, modelName)); } + /** * 通过模型分类获取模型信息 */ @Override - public ChatModelVo selectModelByCategory(String category) { + public ChatModelVo selectModelByCategory(String category) { return baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(ChatModel::getCategory, category)); } - + /** * 通过模型分类获取优先级最高的模型信息 */ @Override public ChatModelVo selectModelByCategoryWithHighestPriority(String category) { return baseMapper.selectVoOne( - Wrappers.lambdaQuery() - .eq(ChatModel::getCategory, category) - .orderByDesc(ChatModel::getPriority) - .last("LIMIT 1") + Wrappers.lambdaQuery() + .eq(ChatModel::getCategory, category) + .orderByDesc(ChatModel::getPriority), + false ); } @@ -156,11 +157,11 @@ public class ChatModelServiceImpl implements IChatModelService { @Override public ChatModelVo selectFallbackModelByCategoryAndLessPriority(String category, Integer currentPriority) { return baseMapper.selectVoOne( - Wrappers.lambdaQuery() - .eq(ChatModel::getCategory, category) - .lt(ChatModel::getPriority, currentPriority) - .orderByDesc(ChatModel::getPriority) - .last("LIMIT 1") + Wrappers.lambdaQuery() + .eq(ChatModel::getCategory, category) + .lt(ChatModel::getPriority, currentPriority) + .orderByDesc(ChatModel::getPriority), + false ); } diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatTokenServiceImpl.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatTokenServiceImpl.java index 80a4c9db..69ad610d 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatTokenServiceImpl.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatTokenServiceImpl.java @@ -23,10 +23,10 @@ public class ChatTokenServiceImpl implements IChatTokenService { @Override public ChatUsageToken queryByUserId(Long userId, String modelName) { return baseMapper.selectOne( - new LambdaQueryWrapper() - .eq(ChatUsageToken::getUserId, userId) - .eq(ChatUsageToken::getModelName, modelName) - .last("limit 1") + new LambdaQueryWrapper() + .eq(ChatUsageToken::getUserId, userId) + .eq(ChatUsageToken::getModelName, modelName), + false ); } @@ -35,7 +35,7 @@ public class ChatTokenServiceImpl implements IChatTokenService { * */ @Override - public void resetToken(Long userId,String modelName) { + public void resetToken(Long userId, String modelName) { ChatUsageToken chatToken = queryByUserId(userId, modelName); chatToken.setToken(0); baseMapper.updateById(chatToken); @@ -47,9 +47,9 @@ public class ChatTokenServiceImpl implements IChatTokenService { */ @Override public void editToken(ChatUsageToken chatToken) { - if(chatToken.getId() == null){ + if (chatToken.getId() == null) { baseMapper.insert(chatToken); - }else { + } else { baseMapper.updateById(chatToken); } } diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/PromptTemplateServiceImpl.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/PromptTemplateServiceImpl.java index 2f3a7572..f2acc64c 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/PromptTemplateServiceImpl.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/PromptTemplateServiceImpl.java @@ -115,7 +115,6 @@ public class PromptTemplateServiceImpl implements IPromptTemplateService { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PromptTemplate.class); queryWrapper.eq(PromptTemplate::getCategory, category); queryWrapper.orderByDesc(PromptTemplate::getUpdateTime); - queryWrapper.last("limit 1"); - return baseMapper.selectVoOne(queryWrapper); + return baseMapper.selectVoOne(queryWrapper, false); } } \ No newline at end of file