From fe70ca5db711b458714bfbe4a6eda6cf7d8a0421 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 16 Sep 2025 13:58:46 +0800
Subject: [PATCH] feat(member): 添加会员公司ID并更新相关服务
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
index db3d4ba..61c9102 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
@@ -1,13 +1,15 @@
package cc.mrbird.febs.ai.service.impl;
+import cc.mrbird.febs.ai.enumerates.AiTypeEnum;
import cc.mrbird.febs.ai.entity.AiMemberTalk;
import cc.mrbird.febs.ai.entity.AiMemberTalkItem;
import cc.mrbird.febs.ai.entity.AiProductRoleLink;
import cc.mrbird.febs.ai.mapper.AiMemberTalkMapper;
+import cc.mrbird.febs.ai.req.ai.AiMessage;
import cc.mrbird.febs.ai.req.ai.AiRequest;
-import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkAnswerDto;
-import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkDto;
+import cc.mrbird.febs.ai.req.memberTalk.*;
import cc.mrbird.febs.ai.res.ai.AiResponse;
+import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkReloadVo;
import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkVo;
import cc.mrbird.febs.ai.service.AiMemberTalkItemService;
import cc.mrbird.febs.ai.service.AiMemberTalkService;
@@ -19,14 +21,18 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import reactor.core.publisher.Flux;
import java.util.Date;
+import java.util.List;
import java.util.function.Consumer;
/**
@@ -52,6 +58,7 @@
}
@Override
+ @Transactional
public FebsResponse start(ApiMemberTalkDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
@@ -64,6 +71,7 @@
if(ObjectUtil.isNull(aiProductRoleLink)){
throw new FebsException("产品AI陪练不存在");
}
+ String companyId = aiProductRoleLink.getCompanyId();
Date nowTime = new Date();
LambdaQueryWrapper<AiMemberTalk> query = Wrappers.lambdaQuery(AiMemberTalk.class);
@@ -72,23 +80,45 @@
query.last("limit 1");
AiMemberTalk aiMemberTalk = this.getByQuery(query);
if (ObjectUtil.isNull(aiMemberTalk)){
- aiMemberTalk = this.add(memberUuid,productId,nowTime);
+ aiMemberTalk = this.add(memberUuid,companyId,productId,nowTime);
}
- AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(),"<strong>\"生成题目\"</strong>");
- if(aiResponse.getCode().equals("200")){
- aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),1,aiResponse.getResContext(),nowTime);
- this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
- }else{
- throw new FebsException(aiResponse.getDescription());
- }
+ List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.QUESTION.getCode());
+
+ AiResponse aiResponse = aiService.start(aiMessageDtoList,AiTypeEnum.QUESTION.getCode(),aiProductRoleLink.getProductRoleId(),AiTypeEnum.QUESTION.getName(), null);
+
ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
apiMemberTalkVo.setType(1);
apiMemberTalkVo.setContext(aiResponse.getResContext());
- apiMemberTalkVo.setReport(aiResponse.getReport());
-
+ if(aiResponse.getCode().equals("200")){
+ AiMemberTalkItem aiMemberTalkItem = aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(),companyId, 1, aiResponse.getResContext(), nowTime);
+ apiMemberTalkVo.setMemberTalkItemId(aiMemberTalkItem.getId());
+ this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
+ }else{
+ throw new FebsException(aiResponse.getDescription());
+ }
return new FebsResponse().success().data(apiMemberTalkVo);
+ }
+
+ @Override
+ public FebsResponse reload(ApiMemberTalkReloadDto dto) {
+
+ String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ ApiMemberTalkReloadVo apiMemberTalkReloadVo = new ApiMemberTalkReloadVo();
+ String memberTalkId = dto.getMemberTalkId();
+ LambdaQueryWrapper<AiMemberTalkItem> queryWrapper = Wrappers.lambdaQuery(AiMemberTalkItem.class);
+ queryWrapper.eq(AiMemberTalkItem::getMemberTalkId,memberTalkId);
+ queryWrapper.eq(AiMemberTalkItem::getType,AiTypeEnum.QUESTION_ANSWER.getCode());
+ queryWrapper.orderByDesc(AiMemberTalkItem::getCreatedTime);
+ queryWrapper.last("limit 1");
+ AiMemberTalkItem byQuery = aiMemberTalkItemService.getByQuery(queryWrapper);
+ if (ObjectUtil.isNotNull(byQuery)){
+ apiMemberTalkReloadVo.setContext(byQuery.getContext());
+ apiMemberTalkReloadVo.setMemberTalkId(memberTalkId);
+ apiMemberTalkReloadVo.setType(AiTypeEnum.QUESTION_ANSWER.getCode());
+ }
+ return new FebsResponse().success().data(apiMemberTalkReloadVo);
}
@Override
@@ -108,6 +138,7 @@
callback.accept(aiResponse);
return;
}
+ String companyId = aiProductRoleLink.getCompanyId();
// 构造AI请求
AiRequest aiRequest = new AiRequest();
@@ -124,14 +155,14 @@
query.last("limit 1");
AiMemberTalk aiMemberTalk = this.getByQuery(query);
if (ObjectUtil.isNull(aiMemberTalk)) {
- aiMemberTalk = this.add(memberUuid, productId, nowTime);
+ aiMemberTalk = this.add(memberUuid,companyId, productId, nowTime);
}
try {
if (aiResponse.getCode().equals("200")) {
// 如果是最终结果（包含报告）
if (aiResponse.getReport() != null) {
// 保存完整响应到数据库
- aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(), 1, aiResponse.getResContext(), nowTime);
+ aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(),companyId, 1, aiResponse.getResContext(), nowTime);
this.updateTimeUpdate(nowTime, aiMemberTalk.getId());
callback.accept(aiResponse);
@@ -176,8 +207,9 @@
}
- public static final String ANSWER_FORMAT = "{}/n[回答]{}/n";
+ public static final String ANSWER_FORMAT = "###题目：{}###用户回答：{}";
@Override
+ @Transactional
public FebsResponse answer(ApiMemberTalkAnswerDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
String memberTalkId = dto.getId();
@@ -185,6 +217,8 @@
if (ObjectUtil.isNull(aiMemberTalk)){
throw new FebsException("产品AI陪练对话不存在");
}
+
+ String companyId = aiMemberTalk.getCompanyId();
LambdaQueryWrapper<AiProductRoleLink> productLinkQuery = Wrappers.lambdaQuery(AiProductRoleLink.class);
productLinkQuery.eq(AiProductRoleLink::getProductId,aiMemberTalk.getProductId());
@@ -203,34 +237,60 @@
memberTalkItemQuery.orderByDesc(AiMemberTalkItem::getCreatedTime);
memberTalkItemQuery.last("limit 1");
AiMemberTalkItem aiMemberTalkItem = aiMemberTalkItemService.getByQuery(memberTalkItemQuery);
- aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),2,reqContext,new Date());
+ aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),companyId,2,reqContext,new Date());
String format = StrUtil.format(ANSWER_FORMAT, aiMemberTalkItem.getContext(), reqContext);
log.info("format:{}",format);
- AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), format);
-// AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), reqContext);
- if(aiResponse.getCode().equals("200")){
- Date nowTime = new Date();
- aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3,aiResponse.getResContext(),nowTime);
- this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
- }else{
- throw new FebsException(aiResponse.getDescription());
- }
+// AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), format);
+
+
ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
apiMemberTalkVo.setType(3);
- apiMemberTalkVo.setContext(aiResponse.getResContext());
- apiMemberTalkVo.setReport(aiResponse.getReport());
+ List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.ANSWER.getCode());
+ AiResponse aiResponse = aiService.start(aiMessageDtoList,AiTypeEnum.ANSWER.getCode(),aiProductRoleLink.getProductRoleId(), reqContext,aiMemberTalkItem.getContext());
+ String context = null;
+ if(aiResponse.getCode().equals("200")){
+ Date nowTime = new Date();
+ context = String.valueOf(JSONUtil.parse(aiResponse.getReport()));
+ if ("null".equals( context)){
+ context = aiResponse.getResContext();
+ }
+ AiMemberTalkItem talkItem = aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(),companyId, 3, context, nowTime);
+ this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
+
+
+ apiMemberTalkVo.setContext(context);
+ apiMemberTalkVo.setMemberTalkItemId(talkItem.getId());
+ }else{
+ throw new FebsException(aiResponse.getDescription());
+ }
return new FebsResponse().success().data(apiMemberTalkVo);
}
@Override
- public AiMemberTalk add(String memberUuid, String productId, Date nowTime) {
+ public AiMemberTalk add(String memberUuid,String companyId, String productId, Date nowTime) {
AiMemberTalk aiMemberTalk = new AiMemberTalk();
aiMemberTalk.setId(UUID.getSimpleUUIDString());
+ aiMemberTalk.setCompanyId(companyId);
aiMemberTalk.setCreatedTime(nowTime);
aiMemberTalk.setMemberId(memberUuid);
aiMemberTalk.setProductId(productId);
aiMemberTalkMapper.insert(aiMemberTalk);
return aiMemberTalk;
}
+
+ @Override
+ public FebsResponse historyPage(ApiMemberTalkItemPageDto dto) {
+ String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ dto.setMemberUuid(memberUuid);
+ return new FebsResponse().success().data(aiMemberTalkItemService.historyPage(dto));
+ }
+
+ @Override
+ public Flux<FebsResponse> answerStream(String question) {
+
+// String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ return aiService.answerStream(question);
+ }
+
}
--
Gitblit v1.9.1