refactor(mapping): 调整管道映射查询方法参数

- 修改 findByPipelineIdAndDocumentTypeAndSystemDataId 方法签名，移除 pipelineDataId 参数 - 新增 findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId 方法用于精确查询 - 更新接口和实现类中的方法定义与调用 - 补充数据库查询语句和 XML 配置文件的对应修改 - 在 TaxReceiveService 中使用新的精确查询方法替换原有调用 - 设置默认状态为 SYNCED 以确保数据一致性

refactor(mapping): 调整管道映射查询方法参数
- 修改 findByPipelineIdAndDocumentTypeAndSystemDataId 方法签名，移除 pipelineDataId 参数 - 新增 findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId 方法用于精确查询 - 更新接口和实现类中的方法定义与调用 - 补充数据库查询语句和 XML 配置文件的对应修改 - 在 TaxReceiveService 中使用新的精确查询方法替换原有调用 - 设置默认状态为 SYNCED 以确保数据一致性
zhangmeiyang
1 parent 93a3cc03
Showing 6 changed files with 61 additions and 4 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/repo/TaxPipelineMappingRepository.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
@@ -62,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(),messageContext.getPipelineDataId());
+        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(messageContext.getTenantPipeline().getTenantId(), messageContext.getTenantPipeline().getId(), messageContext.getDocumentType(), messageContext.getSystemDataId(),messageContext.getPipelineDataId());
         dbOptions.ifPresentOrElse(
                 e -> {
                     TaxPipelineMappingCreate create = new TaxPipelineMappingCreate();
@@ -17,7 +17,19 @@ public interface ITaxPipelineMappingService {
      * @param pipelineDataId
      * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
      */
-    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId, String pipelineDataId);
+    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId, String pipelineDataId);
+
+
+    /**
+     * 按管道 ID 和文档类型以及系统数据 ID 查找
+     *
+     * @param tenantId       租户 ID
+     * @param pipelineId     管道 ID
+     * @param documentType   文档类型
+     * @param systemDataId   系统数据 ID
+     * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
+     */
+    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId);
     /**
      * 插入
@@ -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, messageContext.getPipelineDataId());
+        Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(pipeline.getTenantId(), pipeline.getId(), markDocument().value, systemDataId);
         dbOptions.ifPresent(e -> {
             customer.setCustomerId(e.getPipelineDataId());
             customer.setSystemDataId(e.getSystemDataId());
@@ -44,6 +44,15 @@ public interface TaxPipelineMappingRepository {
     Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(TaxPipelineMapping mapping);
     /**
+     * 通过管道ID、文档类型以及系统数据ID和管道数据ID查找
+     *
+     * @param taxPipelineMapping 税收管道映射
+     * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
+     */
+    Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(TaxPipelineMapping taxPipelineMapping);
+
+
+    /**
      * 创建租户映射表
      *
      * @param tableName 表名
@@ -63,4 +72,5 @@ public interface TaxPipelineMappingRepository {
      * @param taxPipelineMapping 税务管道映射
      */
     void update(TaxPipelineMapping taxPipelineMapping);
+
 }
@@ -69,7 +69,7 @@ public class DynamicTaxPipelineMappingService implements ITaxPipelineMappingServ
      * @return {@link Optional }<{@link TenantTaxPipelineMapping }>
      */
     @Override
-    public Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId, String pipelineDataId) {
+    public Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(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, "文档类型不能为空"));
@@ -82,6 +82,21 @@ public class DynamicTaxPipelineMappingService implements ITaxPipelineMappingServ
         taxPipelineMapping.setSystemDataId(systemDataId);
         taxPipelineMapping.setPipelineDataId(pipelineDataId);
         taxPipelineMapping.setState(MappingStateType.SYNCED.value);
+        return taxPipelineMappingRepository.findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(taxPipelineMapping);
+    }
+
+    @Override
+    public Optional<TenantTaxPipelineMapping> findByPipelineIdAndDocumentTypeAndSystemDataId(Long tenantId, Long pipelineId, String documentType, String systemDataId) {
+        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, "系统数据不能为空"));
+        TaxPipelineMapping taxPipelineMapping = new TaxPipelineMapping();
+        taxPipelineMapping.setTenantId(tenantId);
+        taxPipelineMapping.setPipelineId(pipelineId);
+        taxPipelineMapping.setDocumentType(documentType);
+        taxPipelineMapping.setSystemDataId(systemDataId);
+        taxPipelineMapping.setState(MappingStateType.SYNCED.value);
         return taxPipelineMappingRepository.findByPipelineIdAndDocumentTypeAndSystemDataId(taxPipelineMapping);
     }
@@ -66,6 +66,26 @@
           AND pipeline_id = #{pipelineId}
           AND document_type = #{documentType}
           AND system_data_id = #{systemDataId}
+    </select>
+    <select id="findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId"
+            resultType="com.diligrp.tax.central.model.TenantTaxPipelineMapping">
+        SELECT
+            id
+          , pipeline_id
+          , document_type
+          , system_data_id
+          , pipeline_data_id
+          , origin_data
+          , state
+          , created_Time
+          , modified_Time
+        FROM
+            tax_pipeline_mapping_${tenantId}
+        WHERE
+              1 = 1
+          AND pipeline_id = #{pipelineId}
+          AND document_type = #{documentType}
+          AND system_data_id = #{systemDataId}
           AND pipeline_data_id = #{pipelineDataId}
     </select>