From 6c340588edca370436c38f0b146e0edadcd32ff9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 18 Mar 2026 16:22:15 +0800
Subject: [PATCH] fix(yinhe): 修复AI服务响应状态和排序问题
---
src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++----------
1 files changed, 106 insertions(+), 30 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java b/src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java
index 1c55aef..8e21916 100644
--- a/src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java
@@ -1,12 +1,12 @@
package cc.mrbird.febs.yinhe.service.impl;
+import cc.mrbird.febs.ai.res.product.ApiProductVo;
import cc.mrbird.febs.ai.strategy.LlmStrategyFactory;
import cc.mrbird.febs.ai.strategy.enumerates.LlmStrategyEnum;
import cc.mrbird.febs.ai.utils.UUID;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
-import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.YHLoginUserUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
@@ -22,6 +22,7 @@
import com.alibaba.dashscope.common.Role;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -39,6 +40,8 @@
private final YhAiMemberMapper yhAiMemberMapper;
private final YHAiCompanyMapper yhAiCompanyMapper;
+ private final YHAiBannerMapper yhAiBannerMapper;
+ private final YHAiLogoMapper yhAiLogoMapper;
private final YHAiAgentCategoryMapper yhAiAgentCategoryMapper;
private final YHAiAgentMapper yhAiAgentMapper;
@@ -87,15 +90,15 @@
@Override
public FebsResponse categoryList(YHCategoryDto dto) {
- String companyId = YHLoginUserUtil.getLoginUser().getCompanyId();
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
+ YhAiMember yhAiMember = yhAiMemberMapper.selectOne(Wrappers.lambdaQuery(YhAiMember.class).eq(YhAiMember::getMemberUuid, memberUuid));
+ String companyId = yhAiMember.getCompanyId();
+
List<YHCategoryVo> yhCategoryVos = new ArrayList<>();
LambdaQueryWrapper<YHAiAgentCategory> query = Wrappers.lambdaQuery(YHAiAgentCategory.class);
query.eq(YHAiAgentCategory::getCompanyId,companyId);
query.eq(YHAiAgentCategory::getState,1);
- if (ObjectUtil.isNotEmpty(dto.getId())){
- query.eq(YHAiAgentCategory::getId,dto.getId());
- }
if (ObjectUtil.isNotEmpty(dto.getHotState())){
query.eq(YHAiAgentCategory::getHotState,dto.getHotState());
}
@@ -116,7 +119,9 @@
@Override
public FebsResponse agentList(YHAgentDto dto) {
- String companyId = YHLoginUserUtil.getLoginUser().getCompanyId();
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
+ YhAiMember yhAiMember = yhAiMemberMapper.selectOne(Wrappers.lambdaQuery(YhAiMember.class).eq(YhAiMember::getMemberUuid, memberUuid));
+ String companyId = yhAiMember.getCompanyId();
ArrayList<YHAgentVo> yhAgentVos = new ArrayList<>();
LambdaQueryWrapper<YHAiAgent> query = Wrappers.lambdaQuery(YHAiAgent.class);
@@ -145,7 +150,7 @@
@Override
public FebsResponse agentInfo(YHAgentInitDto dto) {
- String companyId = YHLoginUserUtil.getLoginUser().getCompanyId();
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
YHAgentInitVo yhAgentInitVo = new YHAgentInitVo();
String id = dto.getId();
@@ -196,27 +201,10 @@
@Override
public FebsResponse agentSysList(YHSysAgentDto dto) {
- ArrayList<YHSysAgentVo> vos = new ArrayList<>();
- LambdaQueryWrapper<YHSysAgent> query = Wrappers.lambdaQuery(YHSysAgent.class);
- query.eq(YHSysAgent::getState,1);
- if (ObjectUtil.isNotEmpty(dto.getAgentCategoryId())){
- query.eq(YHSysAgent::getAgentCategoryId,dto.getAgentCategoryId());
- }
- query.orderByDesc(YHSysAgent::getCreateTime);
-
- List<YHSysAgent> list = yhSysAgentMapper.selectList(query);
- if (CollUtil.isNotEmpty(list)){
-
- for (YHSysAgent entity : list) {
- YHSysAgentVo vo = new YHSysAgentVo();
- vo.setId(entity.getId());
- vo.setName(entity.getName());
- vo.setDescription(entity.getDescription());
- vo.setIconImg(entity.getIconImg());
- vos.add(vo);
- }
- }
- return new FebsResponse().success().data(vos);
+ // 创建分页对象，传入当前页和每页大小
+ Page<YHSysAgentVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<YHSysAgentVo> pageListByQuery = yhSysAgentMapper.getPageListByQuery(page, dto);
+ return new FebsResponse().success().data(pageListByQuery);
}
@Override
@@ -248,7 +236,7 @@
@Override
public FebsResponse logout() {
- String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
String redisKey = AppContants.XCX_LOGIN_PREFIX + memberUuid;
String existToken = redisUtils.getString(redisKey);
@@ -264,7 +252,7 @@
@Override
public FebsResponse initSend(YHSendInitDto dto) {
- String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
YHSendInitVo vo = new YHSendInitVo();
@@ -438,4 +426,92 @@
}
return messages;
}
+
+ @Override
+ public FebsResponse bannerList() {
+ List<YHBannerVo> vos = new ArrayList<>();
+ List<YHAiBanner> list = yhAiBannerMapper.selectList(
+ Wrappers.lambdaQuery(YHAiBanner.class)
+ .eq(YHAiBanner::getState, 1)
+ .isNull(YHAiBanner::getCompanyId)
+ .orderByDesc(YHAiBanner::getSort)
+ );
+ if (CollUtil.isNotEmpty(list)){
+ for (YHAiBanner aiBanner : list){
+ YHBannerVo vo = new YHBannerVo();
+ vo.setName(aiBanner.getName());
+ vo.setImageUrl(aiBanner.getImageUrl());
+ vo.setSort(aiBanner.getSort());
+ vos.add(vo);
+ }
+ }
+ return new FebsResponse().success().data(vos);
+ }
+
+ @Override
+ public FebsResponse logoInfo() {
+ YHLogoVo yhLogoVo = new YHLogoVo();
+
+ List<YHAiLogo> yhAiLogos = yhAiLogoMapper.selectList(
+ Wrappers.lambdaQuery(YHAiLogo.class)
+ .eq(YHAiLogo::getState, 1)
+ .isNull(YHAiLogo::getCompanyId)
+ );
+ if (CollUtil.isNotEmpty(yhAiLogos)){
+ YHAiLogo yhAiLogo = yhAiLogos.get(0);
+ yhLogoVo.setName(yhAiLogo.getName());
+ yhLogoVo.setImageUrl(yhAiLogo.getImageUrl());
+ yhLogoVo.setDesription(yhAiLogo.getDesription());
+ }
+
+ return new FebsResponse().success().data(yhLogoVo);
+ }
+
+ @Override
+ public FebsResponse loginBannerList() {
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
+ YhAiMember yhAiMember = yhAiMemberMapper.selectOne(Wrappers.lambdaQuery(YhAiMember.class).eq(YhAiMember::getMemberUuid, memberUuid));
+ String companyId = yhAiMember.getCompanyId();
+
+ List<YHBannerVo> vos = new ArrayList<>();
+ List<YHAiBanner> list = yhAiBannerMapper.selectList(
+ Wrappers.lambdaQuery(YHAiBanner.class)
+ .eq(YHAiBanner::getState, 1)
+ .eq(YHAiBanner::getCompanyId, companyId)
+ .orderByAsc(YHAiBanner::getSort)
+ );
+ if (CollUtil.isNotEmpty(list)){
+ for (YHAiBanner aiBanner : list){
+ YHBannerVo vo = new YHBannerVo();
+ vo.setName(aiBanner.getName());
+ vo.setImageUrl(aiBanner.getImageUrl());
+ vo.setSort(aiBanner.getSort());
+ vos.add(vo);
+ }
+ }
+ return new FebsResponse().success().data(vos);
+ }
+
+ @Override
+ public FebsResponse loginLogoInfo() {
+ String memberUuid = YHLoginUserUtil.getLoginUser().getMemberUuid();
+ YhAiMember yhAiMember = yhAiMemberMapper.selectOne(Wrappers.lambdaQuery(YhAiMember.class).eq(YhAiMember::getMemberUuid, memberUuid));
+ String companyId = yhAiMember.getCompanyId();
+
+ YHLogoVo yhLogoVo = new YHLogoVo();
+
+ List<YHAiLogo> yhAiLogos = yhAiLogoMapper.selectList(
+ Wrappers.lambdaQuery(YHAiLogo.class)
+ .eq(YHAiLogo::getState, 1)
+ .eq(YHAiLogo::getCompanyId, companyId)
+ );
+ if (CollUtil.isNotEmpty(yhAiLogos)){
+ YHAiLogo yhAiLogo = yhAiLogos.get(0);
+ yhLogoVo.setName(yhAiLogo.getName());
+ yhLogoVo.setImageUrl(yhAiLogo.getImageUrl());
+ yhLogoVo.setDesription(yhAiLogo.getDesription());
+ }
+
+ return new FebsResponse().success().data(yhLogoVo);
+ }
}
--
Gitblit v1.9.1