feat(storage): 增加管道数据ID参数以优化映射查询

- 在 CustomerBuilder 中调用映射服务时传入 pipelineDataId 参数 - 更新 DynamicTaxPipelineMappingService 方法签名及实现，增加 pipelineDataId 参数 - 修改 ITaxPipelineMappingService 接口定义，支持 pipelineDataId 查询条件 - 调整 TaxPipelineMappingRepository.xml 查询语句，加入 pipeline_data_id 过滤条件 - 修正 TaxReceiveService 中的调用方法，确保传递 pipelineDataId 参数 - 移除 TaxReceiveService 中未使用的 PrintWriter 和 StringWriter 导入语句

feat(storage): 增加管道数据ID参数以优化映射查询
- 在 CustomerBuilder 中调用映射服务时传入 pipelineDataId 参数 - 更新 DynamicTaxPipelineMappingService 方法签名及实现，增加 pipelineDataId 参数 - 修改 ITaxPipelineMappingService 接口定义，支持 pipelineDataId 查询条件 - 调整 TaxPipelineMappingRepository.xml 查询语句，加入 pipeline_data_id 过滤条件 - 修正 TaxReceiveService 中的调用方法，确保传递 pipelineDataId 参数 - 移除 TaxReceiveService 中未使用的 PrintWriter 和 StringWriter 导入语句
zhangmeiyang
1 parent d28ad9a8
Showing 5 changed files with 16 additions and 13 deletions
tax-boot/src/main/java/com/diligrp/tax/boot/service/TaxReceiveService.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITaxPipelineMappingService.java
tax-doc/src/main/java/com/diligrp/tax/doc/demarcate/kingdee/CustomerBuilder.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/DynamicTaxPipelineMappingService.java
tax-storage/src/main/resources/com/diligrp/tax/storage/repo/TaxPipelineMappingRepository.xml
@@ -19,8 +19,6 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Optional;
  
 /**
@@ -64,7 +62,7 @@ public class TaxReceiveService {
  
     @Transactional
     public void recordMapping(MessageContext messageContext) {
-        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(messageContext.getTenantPipeline().getTenantId(), messageContext.getTenantPipeline().getId(), messageContext.getDocumentType(), messageContext.getSystemDataId());
+        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(messageContext.getTenantPipeline().getTenantId(), messageContext.getTenantPipeline().getId(), messageContext.getDocumentType(), messageContext.getSystemDataId(),messageContext.getPipelineDataId());
         dbOptions.ifPresentOrElse(
                 e -> {
                     TaxPipelineMappingCreate create = new TaxPipelineMappingCreate();
@@ -10,13 +10,14 @@ public interface ITaxPipelineMappingService {
     /**
      * 按管道 ID 和文档类型以及系统数据 ID 查找
      *
-     * @param tenantId     租户 ID
-     * @param pipelineId   管道 ID
-     * @param documentType 文档类型
-     * @param systemDataId 系统数据 ID
+     * @param tenantId       租户 ID
+     * @param pipelineId     管道 ID
+     * @param documentType   文档类型
+     * @param systemDataId   系统数据 ID
+     * @param pipelineDataId
      * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
      */
-    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId);
+    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId, String pipelineDataId);
  
     /**
      * 插入
@@ -52,7 +52,7 @@ public class CustomerBuilder extends Builder&lt;StandardCustomer&gt; {
         List<TenantPipelineConfig> list = taxTenantService.listByPipelineIdAndDocumentType(pipeline.getId(), markDocument().value);
         Optional.ofNullable(list).ifPresent(ts -> configureDefaultData(customer, ts));
         //查询数据库的客户信息 如果存在 赋值id
-        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(pipeline.getTenantId(), pipeline.getId(), markDocument().value, systemDataId);
+        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(pipeline.getTenantId(), pipeline.getId(), markDocument().value, systemDataId, messageContext.getPipelineDataId());
         dbOptions.ifPresent(e -> {
             customer.setCustomerId(e.getPipelineDataId());
             customer.setSystemDataId(e.getSystemDataId());
@@ -62,22 +62,25 @@ public class DynamicTaxPipelineMappingService implements ITaxPipelineMappingServ
     /**
      * 按管道 ID 和文档类型以及系统数据 ID 查找
      *
-     * @param pipelineId   管道 ID
-     * @param documentType 文档类型
-     * @param systemDataId 系统数据 ID
+     * @param pipelineId     管道 ID
+     * @param documentType   文档类型
+     * @param systemDataId   系统数据 ID
+     * @param pipelineDataId
      * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
      */
     @Override
-    public Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId) {
+    public Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId, String pipelineDataId) {
         Optional.ofNullable(tenantId).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "租户ID不能为空"));
         Optional.ofNullable(pipelineId).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "管道ID不能为空"));
         Optional.ofNullable(documentType).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "文档类型不能为空"));
         Optional.ofNullable(systemDataId).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "系统数据不能为空"));
+        Optional.ofNullable(pipelineDataId).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "管道数据不能为空"));
         TaxPipelineMapping taxPipelineMapping = new TaxPipelineMapping();
         taxPipelineMapping.setTenantId(tenantId);
         taxPipelineMapping.setPipelineId(pipelineId);
         taxPipelineMapping.setDocumentType(documentType);
         taxPipelineMapping.setSystemDataId(systemDataId);
+        taxPipelineMapping.setPipelineDataId(pipelineDataId);
         taxPipelineMapping.setState(MappingStateType.SYNCED.value);
         return taxPipelineMappingRepository.findByPipelineIdAndDocumentTypeAndSystemDataId(taxPipelineMapping);
     }
@@ -66,6 +66,7 @@
           AND pipeline_id = #{pipelineId}
           AND document_type = #{documentType}
           AND system_data_id = #{systemDataId}
+          AND pipeline_data_id = #{pipelineDataId}
     </select>
  
     <!-- 建表语句 -->