From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiConfigOpsServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiConfigOpsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiConfigOpsServiceImpl.java
index 8993260..a3f0bdd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiConfigOpsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/AiConfigOpsServiceImpl.java
@@ -5,11 +5,12 @@
import com.vincent.rsf.server.ai.dto.AiPromptPreviewDto;
import com.vincent.rsf.server.ai.dto.AiPromptPreviewRequest;
import com.vincent.rsf.server.ai.entity.AiMcpMount;
-import com.vincent.rsf.server.ai.dto.AiResolvedConfig;
import com.vincent.rsf.server.ai.service.AiConfigOpsService;
-import com.vincent.rsf.server.ai.service.AiConfigResolverService;
import com.vincent.rsf.server.ai.service.AiMcpMountService;
+import com.vincent.rsf.server.ai.service.AiParamService;
import com.vincent.rsf.server.ai.service.AiPromptService;
+import com.vincent.rsf.server.ai.entity.AiParam;
+import com.vincent.rsf.server.ai.entity.AiPrompt;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -20,30 +21,33 @@
@RequiredArgsConstructor
public class AiConfigOpsServiceImpl implements AiConfigOpsService {
- private final AiConfigResolverService aiConfigResolverService;
private final AiPromptRenderSupport aiPromptRenderSupport;
+ private final AiParamService aiParamService;
private final AiPromptService aiPromptService;
+ private final AiMcpMountService aiMcpMountService;
@Override
public AiConfigSummaryDto getSummary(String promptCode, Long tenantId) {
String finalPromptCode = StringUtils.hasText(promptCode) ? promptCode : AiDefaults.DEFAULT_PROMPT_CODE;
- AiResolvedConfig resolvedConfig = aiConfigResolverService.resolve(finalPromptCode, tenantId);
- List<AiMcpMount> mounts = resolvedConfig.getMcpMounts();
+ // 杩愯鎬佹憳瑕佸彧闇�瑕佽鍙栧綋鍓嶇敓鏁堥厤缃紝鐩存帴鏌ュ簱鍙互閬垮厤 Redis 涓嶅彲鐢ㄦ椂鐨勯澶栫瓑寰呫��
+ AiParam activeParam = aiParamService.getChatParam(tenantId, null);
+ AiPrompt activePrompt = aiPromptService.getActivePrompt(finalPromptCode, tenantId);
+ List<AiMcpMount> mounts = aiMcpMountService.listActiveMounts(tenantId);
return AiConfigSummaryDto.builder()
- .promptCode(resolvedConfig.getPrompt().getCode())
- .promptName(resolvedConfig.getPrompt().getName())
- .promptScene(resolvedConfig.getPrompt().getScene())
- .activeParamName(resolvedConfig.getAiParam().getName())
- .activeModel(resolvedConfig.getAiParam().getModel())
- .activeParamUpdatedAt(resolvedConfig.getAiParam().getUpdateTime$())
- .activeParamUpdatedBy(resolvedConfig.getAiParam().getUpdateBy())
- .activeParamValidateStatus(resolvedConfig.getAiParam().getValidateStatus())
- .activeParamValidateMessage(resolvedConfig.getAiParam().getLastValidateMessage())
- .activeParamValidatedAt(resolvedConfig.getAiParam().getLastValidateTime$())
+ .promptCode(activePrompt.getCode())
+ .promptName(activePrompt.getName())
+ .promptScene(activePrompt.getScene())
+ .activeParamName(activeParam.getName())
+ .activeModel(activeParam.getModel())
+ .activeParamUpdatedAt(activeParam.getUpdateTime$())
+ .activeParamUpdatedBy(activeParam.getUpdateBy())
+ .activeParamValidateStatus(activeParam.getValidateStatus())
+ .activeParamValidateMessage(activeParam.getLastValidateMessage())
+ .activeParamValidatedAt(activeParam.getLastValidateTime$())
.enabledMcpCount(mounts.size())
.enabledMcpNames(mounts.stream().map(AiMcpMount::getName).toList())
- .activePromptUpdatedAt(resolvedConfig.getPrompt().getUpdateTime$())
- .activePromptUpdatedBy(resolvedConfig.getPrompt().getUpdateBy())
+ .activePromptUpdatedAt(activePrompt.getUpdateTime$())
+ .activePromptUpdatedBy(activePrompt.getUpdateBy())
.build();
}
--
Gitblit v1.9.1