BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 925a07c7de2743dc56a6167d894c181005ec02b1

Authored by YunaiV
1 parent b758e690

fix：【AI 大模型】dictDataApi 未沉底移除干净

Inline Side-by-side
Showing 2 changed files with 11 additions and 8 deletions
yudao-module-ai/yudao-module-ai-biz/pom.xml
  View file @925a07c
... ... @@ -60,5 +60,11 @@
60 60 <groupId>cn.iocoder.boot</groupId>
61 61 <artifactId>yudao-spring-boot-starter-test</artifactId>
62 62 </dependency>
  63 +
  64 + <!-- 工具类相关 -->
  65 + <dependency>
  66 + <groupId>cn.iocoder.boot</groupId>
  67 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
  68 + </dependency>
63 69 </dependencies>
64 70 </project>
65 71 \ No newline at end of file
... ...
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/write/AiWriteServiceImpl.java
  View file @925a07c
... ... @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.ai.core.util.AiUtils;
9 9 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 11 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  12 +import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
12 13 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
13 14 import cn.iocoder.yudao.module.ai.controller.admin.write.vo.AiWriteGenerateReqVO;
14 15 import cn.iocoder.yudao.module.ai.controller.admin.write.vo.AiWritePageReqVO;
... ... @@ -22,7 +23,6 @@ import cn.iocoder.yudao.module.ai.enums.ErrorCodeConstants;
22 23 import cn.iocoder.yudao.module.ai.enums.write.AiWriteTypeEnum;
23 24 import cn.iocoder.yudao.module.ai.service.model.AiChatRoleService;
24 25 import cn.iocoder.yudao.module.ai.service.model.AiModelService;
25   -import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
26 26 import jakarta.annotation.Resource;
27 27 import lombok.extern.slf4j.Slf4j;
28 28 import org.springframework.ai.chat.messages.Message;
... ... @@ -61,9 +61,6 @@ public class AiWriteServiceImpl implements AiWriteService {
61 61 @Resource
62 62 private AiWriteMapper writeMapper;
63 63  
64   - @Resource
65   - private DictDataApi dictDataApi;
66   -
67 64 @Override
68 65 public Flux<CommonResult<String>> generateWriteContent(AiWriteGenerateReqVO generateReqVO, Long userId) {
69 66 // 1 获取写作模型。尝试获取写作助手角色，没有则使用默认模型
... ... @@ -146,10 +143,10 @@ public class AiWriteServiceImpl implements AiWriteService {
146 143 }
147 144  
148 145 private String buildUserMessage(AiWriteGenerateReqVO generateReqVO) {
149   - String format = dictDataApi.getDictDataLabel(DictTypeConstants.AI_WRITE_FORMAT, generateReqVO.getFormat());
150   - String tone = dictDataApi.getDictDataLabel(DictTypeConstants.AI_WRITE_TONE, generateReqVO.getTone());
151   - String language = dictDataApi.getDictDataLabel(DictTypeConstants.AI_WRITE_LANGUAGE, generateReqVO.getLanguage());
152   - String length = dictDataApi.getDictDataLabel(DictTypeConstants.AI_WRITE_LENGTH, generateReqVO.getLength());
  146 + String format = DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.AI_WRITE_FORMAT, generateReqVO.getFormat());
  147 + String tone = DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.AI_WRITE_TONE, generateReqVO.getTone());
  148 + String language = DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.AI_WRITE_LANGUAGE, generateReqVO.getLanguage());
  149 + String length = DictFrameworkUtils.parseDictDataLabel(DictTypeConstants.AI_WRITE_LENGTH, generateReqVO.getLength());
153 150 // 格式化 prompt
154 151 String prompt = generateReqVO.getPrompt();
155 152 if (Objects.equals(generateReqVO.getType(), AiWriteTypeEnum.WRITING.getType())) {
... ...