From 6e9730ebbbff634d27c2c49ec328156c8905b508 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 13:52:14 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
index bf295be..23e34ba 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
@@ -1,9 +1,11 @@
package cc.mrbird.febs.ai.service.impl;
import cc.mrbird.febs.ai.entity.AiCompany;
+import cc.mrbird.febs.ai.entity.AiCompanyMemberApply;
import cc.mrbird.febs.ai.entity.AiMember;
import cc.mrbird.febs.ai.entity.AiMemberRole;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
+import cc.mrbird.febs.ai.mapper.AiCompanyMemberApplyMapper;
import cc.mrbird.febs.ai.mapper.AiMemberRoleMapper;
import cc.mrbird.febs.ai.req.company.ApiCompanyCodeEditDto;
import cc.mrbird.febs.ai.req.memberAnswer.ApiMemberAnswerDto;
@@ -29,6 +31,8 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -44,8 +48,7 @@
private final AiMemberRoleMapper aiMemberRoleMapper;
private final AiCompanyMapper aiCompanyMapper;
- private final MallMemberMapper mallMemberMapper;
- private final AiMemberService aiMemberService;
+ private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;
@Override
public List<AiMemberRole> getListByQuery(LambdaQueryWrapper<AiMemberRole> query) {
@@ -131,46 +134,41 @@
}
@Override
- public FebsResponse editCompanyCode(ApiCompanyCodeEditDto dto) {
-
+ public FebsResponse applyCompanyCode(ApiCompanyCodeEditDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
- String companyId = dto.getCompanyCode();
- if(ObjectUtil.isNotEmpty(dto.getCompanyCode())){
- AiCompany aiCompany = aiCompanyMapper.selectOne(
- Wrappers.lambdaQuery(AiCompany.class)
- .eq(AiCompany::getCode, dto.getCompanyCode())
- .last("limit 1")
- );
- if (ObjectUtil.isEmpty(aiCompany)){
- throw new FebsException("公司编码不存在");
- }
- if (ObjectUtil.isNotEmpty(aiCompany)){
- companyId = aiCompany.getId();
- }
- }
+ String companyCode = dto.getCompanyCode();
+ if (StrUtil.isBlank(companyCode)){
+ throw new FebsException("请选择公司");
- MallMember mallMember = mallMemberMapper.selectOne(
- Wrappers.lambdaQuery(MallMember.class)
- .eq(MallMember::getMemberUuid, memberUuid)
+ }
+ AiCompany aiCompany = aiCompanyMapper.selectOne(
+ Wrappers.lambdaQuery(AiCompany.class)
+ .eq(AiCompany::getCode, dto.getCompanyCode())
.last("limit 1")
);
- mallMember.setCompanyId(companyId);
- mallMemberMapper.update(null,
- Wrappers.lambdaUpdate(MallMember.class)
- .set(MallMember::getCompanyId, companyId)
- .eq(MallMember::getId, mallMember.getId())
- );
-
- AiMember aiMember = aiMemberService.getById(memberUuid);
- if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
- aiMemberService.update(null,
- Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getCompanyId, mallMember.getCompanyId())
- .eq(AiMember::getId, aiMember.getId())
- );
+ if (ObjectUtil.isEmpty(aiCompany)){
+ throw new FebsException("公司编码不存在");
}
+ List<Integer> stateList = Arrays.asList(0, 1);
+
+ List<AiCompanyMemberApply> aiCompanyMemberApplies = aiCompanyMemberApplyMapper.selectList(
+ Wrappers.lambdaQuery(AiCompanyMemberApply.class)
+ .eq(AiCompanyMemberApply::getMemberId, memberUuid)
+ .in(AiCompanyMemberApply::getState, stateList)
+ );
+ if (CollUtil.isNotEmpty(aiCompanyMemberApplies)){
+ throw new FebsException("您已申请过公司，请勿重复申请");
+ }
+
+ AiCompanyMemberApply entity = new AiCompanyMemberApply();
+ entity.setMemberId(memberUuid);
+ entity.setCompanyCode(aiCompany.getCode());
+ entity.setCompanyName(aiCompany.getName());
+ entity.setCreatedTime(new Date());
+ aiCompanyMemberApplyMapper.insert(entity);
+
return new FebsResponse().success();
}
}
--
Gitblit v1.9.1