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/service/questiontemplate/QuestionTemplateServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/service/questiontemplate/QuestionTemplateServiceImpl.java b/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/service/questiontemplate/QuestionTemplateServiceImpl.java
index 98aec9a..9c70d05 100644
--- a/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/service/questiontemplate/QuestionTemplateServiceImpl.java
+++ b/iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/service/questiontemplate/QuestionTemplateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.iailab.module.ai.service.questiontemplate;
 
+import com.iailab.module.ai.controller.admin.questionparamsetting.vo.QuestionParamSettingRespVO;
 import com.iailab.module.ai.dal.dataobject.questionparamsetting.QuestionParamSettingDO;
 import com.iailab.module.ai.dal.mysql.questionparamsetting.QuestionParamSettingMapper;
 import jakarta.annotation.Resource;
@@ -13,6 +14,7 @@
 
 import com.iailab.module.ai.dal.mysql.questiontemplate.QuestionTemplateMapper;
 
+import java.util.List;
 import java.util.UUID;
 
 import static com.iailab.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -38,6 +40,7 @@
         // 插入
         QuestionTemplateDO questionTemplate = BeanUtils.toBean(createReqVO, QuestionTemplateDO.class);
         String id = UUID.randomUUID().toString();
+        questionTemplate.setId(id);
         // 插入设置列表
         createReqVO.getSettingList().forEach(setting -> {
             setting.setTemplateId(id);
@@ -51,15 +54,15 @@
     @Override
     public void updateQuestionTemplate(QuestionTemplateSaveReqVO updateReqVO) {
         // 校验存在
-        String id = UUID.randomUUID().toString();
-        validateQuestionTemplateExists(id);
+        validateQuestionTemplateExists(updateReqVO.getId());
         // 更新
         QuestionTemplateDO updateObj = BeanUtils.toBean(updateReqVO, QuestionTemplateDO.class);
         // 删除设置列表
         questionParamSettingMapper.deleteByTemplateId(updateReqVO.getId());
         // 更新设置列表
         updateReqVO.getSettingList().forEach(setting -> {
-            setting.setTemplateId(id);
+            setting.setTemplateId(updateReqVO.getId());
+            setting.setId(null);
             questionParamSettingMapper.insert(BeanUtils.toBean(setting, QuestionParamSettingDO.class));
         });
         questionTemplateMapper.updateById(updateObj);
@@ -84,7 +87,7 @@
     @Override
     public QuestionTemplateDO getQuestionTemplate(String id) {
         QuestionTemplateDO questionTemplateDO = questionTemplateMapper.selectById(id);
-        questionTemplateDO.setSettingList(BeanUtils.toBean(questionParamSettingMapper.selectList("template_id",id), QuestionTemplateSaveReqVO.class));
+        questionTemplateDO.setSettingList(BeanUtils.toBean(questionParamSettingMapper.selectList("template_id",id), QuestionParamSettingRespVO.class));
         return questionTemplateDO;
     }
 
@@ -93,4 +96,13 @@
         return questionTemplateMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<QuestionTemplateDO> getQuestionTemplateList(Long modelId) {
+        List<QuestionTemplateDO> questionTemplateDOList = questionTemplateMapper.selectList("model_id",modelId);
+        questionTemplateDOList.forEach(DO -> {
+            DO.setSettingList(BeanUtils.toBean(questionParamSettingMapper.selectList("template_id",DO.getId()), QuestionParamSettingRespVO.class));
+        });
+        return questionTemplateDOList;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3