From f5ec1f3326f75e18222859a534ed5a249f5e2cc3 Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期三, 04 六月 2025 17:35:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java b/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java index d673385..712f2b6 100644 --- a/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java +++ b/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java @@ -1,5 +1,6 @@ package com.iailab.module.ai.controller.admin.questiontemplate; +import com.iailab.module.ai.service.model.AiModelService; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -13,6 +14,7 @@ import com.iailab.framework.common.pojo.PageResult; import com.iailab.framework.common.pojo.CommonResult; import com.iailab.framework.common.util.object.BeanUtils; + import static com.iailab.framework.common.pojo.CommonResult.success; @@ -28,6 +30,9 @@ @Resource private QuestionTemplateService questionTemplateService; + + @Resource + private AiModelService aiModelService; @PostMapping("/create") @Operation(summary = "创建大模型问题模板") @@ -59,6 +64,7 @@ @PreAuthorize("@ss.hasPermission('ai:question-template:query')") public CommonResult<QuestionTemplateRespVO> getQuestionTemplate(@RequestParam("id") String id) { QuestionTemplateDO questionTemplate = questionTemplateService.getQuestionTemplate(id); + questionTemplate.setModelName( aiModelService.getModel(Long.valueOf((questionTemplate.getModelId()))).getName()); return success(BeanUtils.toBean(questionTemplate, QuestionTemplateRespVO.class)); } @@ -67,6 +73,11 @@ @PreAuthorize("@ss.hasPermission('ai:question-template:query')") public CommonResult<PageResult<QuestionTemplateRespVO>> getQuestionTemplatePage(@Valid QuestionTemplatePageReqVO pageReqVO) { PageResult<QuestionTemplateDO> pageResult = questionTemplateService.getQuestionTemplatePage(pageReqVO); + pageResult.getList().forEach(questionTemplateDO -> + questionTemplateDO.setModelName( + aiModelService.getModel(Long.valueOf((questionTemplateDO.getModelId()))).getName() + ) + ); return success(BeanUtils.toBean(pageResult, QuestionTemplateRespVO.class)); } -- Gitblit v1.9.3