From ad67ba85ad1b83632356c6cf4aa87933b189c555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BB=98?= <925456043@qq.com> Date: Thu, 16 Apr 2026 21:51:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=AE=9E=E4=BD=93=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将文档桥接层切换到 easy-agents document entity 包 - 清理请求工厂中已移除的 PDF 专属字段调用 - 更新桥接映射与测试以保持知识库 PDF 解析链路可用 --- .../ai/document/model/DocumentParsedResult.java | 8 ++++---- .../service/impl/DocumentParseBridgeServiceImpl.java | 8 ++++---- .../document/support/DocumentParseRequestFactory.java | 8 ++------ .../ai/document/support/DocumentParseResultMapper.java | 8 ++++---- .../impl/DocumentParseBridgeServiceImplTest.java | 10 +++++----- .../support/DocumentParseRequestFactoryTest.java | 5 +---- .../support/DocumentParseResultMapperTest.java | 8 ++++---- 7 files changed, 24 insertions(+), 31 deletions(-) diff --git a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/model/DocumentParsedResult.java b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/model/DocumentParsedResult.java index 0f5ed6e..76c57ca 100644 --- a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/model/DocumentParsedResult.java +++ b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/model/DocumentParsedResult.java @@ -1,9 +1,9 @@ package tech.easyflow.ai.document.model; -import com.easyagents.document.core.model.DocumentBlock; -import com.easyagents.document.core.model.DocumentImage; -import com.easyagents.document.core.model.DocumentPage; -import com.easyagents.document.core.model.DocumentTable; +import com.easyagents.document.core.entity.DocumentBlock; +import com.easyagents.document.core.entity.DocumentImage; +import com.easyagents.document.core.entity.DocumentPage; +import com.easyagents.document.core.entity.DocumentTable; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImpl.java b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImpl.java index e0fda09..c76b91c 100644 --- a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImpl.java +++ b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImpl.java @@ -1,10 +1,10 @@ package tech.easyflow.ai.document.service.impl; import com.easyagents.document.core.DocumentParseService; -import com.easyagents.document.core.model.ParseResponse; -import com.easyagents.document.core.model.ParseResult; -import com.easyagents.document.core.model.ParseTaskInfo; -import com.easyagents.document.core.model.ParseTaskStatus; +import com.easyagents.document.core.entity.ParseResponse; +import com.easyagents.document.core.entity.ParseResult; +import com.easyagents.document.core.entity.ParseTaskInfo; +import com.easyagents.document.core.entity.ParseTaskStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; diff --git a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseRequestFactory.java b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseRequestFactory.java index 0b49319..1d6baac 100644 --- a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseRequestFactory.java +++ b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseRequestFactory.java @@ -1,7 +1,7 @@ package tech.easyflow.ai.document.support; -import com.easyagents.document.core.model.ParseFile; -import com.easyagents.document.core.model.ParseRequest; +import com.easyagents.document.core.entity.ParseFile; +import com.easyagents.document.core.entity.ParseRequest; import org.springframework.stereotype.Component; import tech.easyflow.ai.document.exception.DocumentParseBridgeException; import tech.easyflow.ai.document.model.DocumentParseScenario; @@ -32,10 +32,6 @@ public class DocumentParseRequestFactory { throw DocumentParseBridgeException.requestBuildFailed("解析场景不能为空"); } ParseRequest request = new ParseRequest(); - // 保持为空，交由 easy-agents provider 按环境配置回填默认值。 - request.setParseMethod(null); - request.setFormulaEnabled(null); - request.setTableEnabled(null); request.addFile(ParseFile.of(source.getFileName(), source.getContentBytes(), source.getContentType())); applyScenario(request, scenario); return request; diff --git a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseResultMapper.java b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseResultMapper.java index d1b4eae..4097c92 100644 --- a/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseResultMapper.java +++ b/easyflow-modules/easyflow-module-ai/src/main/java/tech/easyflow/ai/document/support/DocumentParseResultMapper.java @@ -1,9 +1,9 @@ package tech.easyflow.ai.document.support; -import com.easyagents.document.core.model.ParseArtifacts; -import com.easyagents.document.core.model.ParseResult; -import com.easyagents.document.core.model.ParseTaskInfo; -import com.easyagents.document.core.model.ParseTaskStatus; +import com.easyagents.document.core.entity.ParseArtifacts; +import com.easyagents.document.core.entity.ParseResult; +import com.easyagents.document.core.entity.ParseTaskInfo; +import com.easyagents.document.core.entity.ParseTaskStatus; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import tech.easyflow.ai.document.model.DocumentParseArtifacts; diff --git a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImplTest.java b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImplTest.java index 7854901..2da518f 100644 --- a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImplTest.java +++ b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/service/impl/DocumentParseBridgeServiceImplTest.java @@ -1,11 +1,11 @@ package tech.easyflow.ai.document.service.impl; import com.easyagents.document.core.DocumentParseService; -import com.easyagents.document.core.model.ParseRequest; -import com.easyagents.document.core.model.ParseResponse; -import com.easyagents.document.core.model.ParseResult; -import com.easyagents.document.core.model.ParseTaskInfo; -import com.easyagents.document.core.model.ParseTaskStatus; +import com.easyagents.document.core.entity.ParseRequest; +import com.easyagents.document.core.entity.ParseResponse; +import com.easyagents.document.core.entity.ParseResult; +import com.easyagents.document.core.entity.ParseTaskInfo; +import com.easyagents.document.core.entity.ParseTaskStatus; import org.junit.Assert; import org.junit.Test; import tech.easyflow.ai.document.exception.DocumentParseBridgeException; diff --git a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseRequestFactoryTest.java b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseRequestFactoryTest.java index 8e42d82..ec1f17d 100644 --- a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseRequestFactoryTest.java +++ b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseRequestFactoryTest.java @@ -1,6 +1,6 @@ package tech.easyflow.ai.document.support; -import com.easyagents.document.core.model.ParseRequest; +import com.easyagents.document.core.entity.ParseRequest; import org.junit.Assert; import org.junit.Test; import tech.easyflow.ai.document.model.DocumentParseScenario; @@ -22,9 +22,6 @@ public class DocumentParseRequestFactoryTest { ParseRequest request = factory.build(buildSource(), DocumentParseScenario.WORKFLOW_TEXT); - Assert.assertNull(request.getParseMethod()); - Assert.assertNull(request.getFormulaEnabled()); - Assert.assertNull(request.getTableEnabled()); Assert.assertTrue(request.getReturnMarkdown()); Assert.assertFalse(request.getReturnMiddleJson()); Assert.assertFalse(request.getReturnContentList()); diff --git a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseResultMapperTest.java b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseResultMapperTest.java index 7fcf9ed..0547337 100644 --- a/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseResultMapperTest.java +++ b/easyflow-modules/easyflow-module-ai/src/test/java/tech/easyflow/ai/document/support/DocumentParseResultMapperTest.java @@ -1,9 +1,9 @@ package tech.easyflow.ai.document.support; -import com.easyagents.document.core.model.ParseArtifacts; -import com.easyagents.document.core.model.ParseResult; -import com.easyagents.document.core.model.ParseResponse; -import com.easyagents.document.core.model.ParseTaskInfo; +import com.easyagents.document.core.entity.ParseArtifacts; +import com.easyagents.document.core.entity.ParseResult; +import com.easyagents.document.core.entity.ParseResponse; +import com.easyagents.document.core.entity.ParseTaskInfo; import org.junit.Assert; import org.junit.Test; import tech.easyflow.ai.document.model.DocumentParseTaskInfo;