diff --git a/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntime.java b/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntime.java index dada5dea..bde74b30 100644 --- a/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntime.java +++ b/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntime.java @@ -27,13 +27,13 @@ public class WorkflowRuntime extends BaseEntity { @TableField("workflow_id") private Long workflowId; - @TableField(value = "input") + @TableField(value = "`input`") private String input; - @TableField(value = "output") + @TableField(value = "`output`") private String output; - @TableField("status") + @TableField("`status`") private Integer status; @TableField("status_remark") diff --git a/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntimeNode.java b/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntimeNode.java index a472b5a1..00550a73 100644 --- a/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntimeNode.java +++ b/ruoyi-modules/ruoyi-aiflow/src/main/java/org/ruoyi/workflow/entity/WorkflowRuntimeNode.java @@ -29,13 +29,13 @@ public class WorkflowRuntimeNode extends BaseEntity { @TableField("node_id") private Long nodeId; - @TableField(value = "input") + @TableField(value = "`input`") private String input; - @TableField(value = "output") + @TableField(value = "`output`") private String output; - @TableField("status") + @TableField("`status`") private Integer status; @TableField("status_remark") diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/factory/EmbeddingModelFactory.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/factory/EmbeddingModelFactory.java index 19ef4337..0db9d859 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/factory/EmbeddingModelFactory.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/factory/EmbeddingModelFactory.java @@ -25,6 +25,14 @@ import java.util.concurrent.ConcurrentHashMap; @Slf4j public class EmbeddingModelFactory { + /** + * 厂商 providerCode → Spring Bean 名称映射 + * 处理 providerCode 与 @Component 注册名不一致的情况 + */ + private static final Map PROVIDER_BEAN_MAPPING = Map.of( + "qianwen", "alibailian" + ); + private final ApplicationContext applicationContext; private final IChatModelService chatModelService; @@ -116,8 +124,10 @@ public class EmbeddingModelFactory { */ private BaseEmbedModelService createModelInstance(String factory, ChatModelVo config) { try { + // 解析实际的 Bean 名称(处理 providerCode 与 @Component 注册名不一致的情况) + String beanName = PROVIDER_BEAN_MAPPING.getOrDefault(factory, factory); // 从Spring上下文中获取模型实例 - BaseEmbedModelService model = applicationContext.getBean(factory, BaseEmbedModelService.class); + BaseEmbedModelService model = applicationContext.getBean(beanName, BaseEmbedModelService.class); // 配置模型参数 model.configure(config); // 增加嵌入模型监听器