feat(tax): 新增映射错误处理机制并优化租户服务

- 新增 TaxMappingError 实体及对应仓储和服务实现 - 新增 ITaxMappingErrorService 接口用于处理映射错误记录-重构 TaxReceiveService，分离错误记录逻辑至独立服务 - 移除 TenantTaxService 类，功能合并到 TaxTenantService 并实现 ITaxTenantService 接口 - 调整 TenantStorageContext 使用 ITaxTenantService 接口而非具体实现 - 更新 ITaxPipelineMappingService 接口签名和依赖引用- 删除 TaxPipelineMapping 和 TaxPipelineMappingCreate 中的 errorMessage 字段 - CustomerBuilder 中补充设置 systemDataId 字段 - TaxReceiver 中调整消息预处理方式，直接使用 MessageContext 参数传递 -优化 MyBatis XML 映射文件，移除对 errorMessage 字段的操作 - 表结构同步删除 tax_pipeline_mapping 表中的 error_message 字段

feat(tax): 新增映射错误处理机制并优化租户服务
- 新增 TaxMappingError 实体及对应仓储和服务实现 - 新增 ITaxMappingErrorService 接口用于处理映射错误记录-重构 TaxReceiveService，分离错误记录逻辑至独立服务 - 移除 TenantTaxService 类，功能合并到 TaxTenantService 并实现 ITaxTenantService 接口 - 调整 TenantStorageContext 使用 ITaxTenantService 接口而非具体实现 - 更新 ITaxPipelineMappingService 接口签名和依赖引用- 删除 TaxPipelineMapping 和 TaxPipelineMappingCreate 中的 errorMessage 字段 - CustomerBuilder 中补充设置 systemDataId 字段 - TaxReceiver 中调整消息预处理方式，直接使用 MessageContext 参数传递 -优化 MyBatis XML 映射文件，移除对 errorMessage 字段的操作 - 表结构同步删除 tax_pipeline_mapping 表中的 error_message 字段
zhangmeiyang
1 parent 27c00a4b
Showing 17 changed files with 321 additions and 128 deletions
tax-boot/src/main/java/com/diligrp/tax/boot/receiver/TaxReceiver.java
tax-boot/src/main/java/com/diligrp/tax/boot/service/TaxReceiveService.java
tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
tax-central/src/main/java/com/diligrp/tax/central/model/TaxPipelineMappingCreate.java
tax-central/src/main/java/com/diligrp/tax/central/model/TaxPipelineMappingError.java
tax-central/src/main/java/com/diligrp/tax/central/model/TenantTaxPipelineMapping.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITaxMappingErrorService.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITaxPipelineMappingService.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITenantTaxService.java → tax-central/src/main/java/com/diligrp/tax/central/service/ITaxTenantService.java
tax-doc/src/main/java/com/diligrp/tax/doc/demarcate/kingdee/CustomerBuilder.java
tax-storage/src/main/java/com/diligrp/tax/storage/domain/TaxMappingError.java
tax-storage/src/main/java/com/diligrp/tax/storage/domain/TaxPipelineMapping.java
tax-storage/src/main/java/com/diligrp/tax/storage/repo/TaxMappingErrorRepository.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TaxMappingErrorService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TaxTenantService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TenantTaxService.java
tax-storage/src/main/resources/com/diligrp/tax/storage/repo/TaxPipelineMappingRepository.xml
@@ -4,6 +4,7 @@ import com.diligrp.tax.boot.service.TaxReceiveService;
 import com.diligrp.tax.central.domain.MessageContext;
 import com.diligrp.tax.central.process.ProcessorChain;
 import com.diligrp.tax.central.type.SystemType;
+import com.diligrp.tax.central.utils.JsonUtils;
 import com.rabbitmq.client.Channel;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -51,7 +52,8 @@ public class TaxReceiver {
         log.info("tax-agent收到消息:{}", content);
         MessageContext ctx = null;
         try {
-            ctx = taxReceiveService.messagePreHandle(content);
+            ctx = JsonUtils.fromJsonString(content, MessageContext.class);
+            taxReceiveService.messagePreHandle(ctx);
             var trans = processorChainMap.get(SystemType.from(ctx.getSystemType())).startProcess(ctx);
             taxReceiveService.recordMapping(trans);
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
@@ -4,15 +4,16 @@ import com.diligrp.tax.central.context.TenantStorageContext;
 import com.diligrp.tax.central.domain.MessageContext;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.model.TaxPipelineMappingCreate;
+import com.diligrp.tax.central.model.TaxPipelineMappingError;
 import com.diligrp.tax.central.model.TenantPipeline;
 import com.diligrp.tax.central.model.TenantTaxPipelineMapping;
+import com.diligrp.tax.central.service.ITaxMappingErrorService;
 import com.diligrp.tax.central.service.ITaxPipelineMappingService;
-import com.diligrp.tax.central.service.ITenantTaxService;
+import com.diligrp.tax.central.service.ITaxTenantService;
 import com.diligrp.tax.central.type.DocumentType;
 import com.diligrp.tax.central.type.MappingStateType;
 import com.diligrp.tax.central.type.SystemType;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.diligrp.tax.central.utils.JsonUtils;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,14 +31,19 @@ import java.util.Optional;
 public class TaxReceiveService {
     @Resource
-    private ITenantTaxService tenantTaxService;
+    private ITaxTenantService tenantTaxService;
     @Resource
     private ITaxPipelineMappingService taxPipelineMappingService;
+    @Resource
+    private ITaxMappingErrorService taxMappingErrorService;
+
+    @Resource
+    private TenantStorageContext tenantStorageContext;
+
-    public MessageContext messagePreHandle(String content) {
-        MessageContext ctx = JsonUtils.fromJsonString(content, MessageContext.class);
+    public void messagePreHandle(MessageContext ctx) {
         Long tenantId = tenantTaxService.getTenantId(ctx.getGroup(), ctx.getEntity());
         ctx.setTenantId(tenantId);
         DocumentType from = DocumentType.from(ctx.getDocumentType());
@@ -46,13 +52,13 @@ public class TaxReceiveService {
         // 校验业务类型和系统类型
         ctx.setDocumentTypeEnum(from);
         ctx.setSystemTypeEnum(system);
-        Optional<TenantPipeline> option = TenantStorageContext.getTenantPipeline(ctx.getTenantId(), system, ctx.getPipelineCode());
+        // 获取租户管道
+        Optional<TenantPipeline> option = tenantStorageContext.getTenantPipeline(ctx.getTenantId(), system, ctx.getPipelineCode());
         TenantPipeline pipeline = option.orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.NO_MATCHING_SET_OF_ACCOUNTS_FOUND));
         //获取租户账套
         ctx.setTenantPipeline(pipeline);
         //获取租户id
         ctx.setTenantId(tenantTaxService.getTenantId(ctx.getGroup(), ctx.getEntity()));
-        return ctx;
     }
     @Transactional
@@ -81,19 +87,17 @@ public class TaxReceiveService {
     @Transactional
     public void recordMappingError(Exception e, MessageContext ctx) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        e.printStackTrace(pw);
-        TaxPipelineMappingCreate create = new TaxPipelineMappingCreate();
-        create.setTenantId(ctx.getTenantId());
-        create.setPipelineId(ctx.getTenantPipeline().getId());
-        create.setDocumentType(ctx.getDocumentType());
-        create.setSystemDataId(ctx.getSystemDataId());
-        create.setPipelineDataId(ctx.getPipelineDataId());
-        create.setOriginData(ctx.getMsgBody());
-        create.setState(MappingStateType.SYNC_FAILED.value);
-        create.setErrorMessage(sw.toString());
-        taxPipelineMappingService.insert(create);
+        TaxPipelineMappingError error = new TaxPipelineMappingError();
+        error.setGroup(ctx.getGroup());
+        error.setEntity(ctx.getEntity());
+        error.setDocumentType(ctx.getDocumentType());
+        error.setSystemType(ctx.getSystemType());
+        error.setSystemDataId(ctx.getSystemDataId());
+        error.setPipelineCode(ctx.getPipelineCode());
+        error.setOriginData(ctx.getMsgBody());
+        error.setState(MappingStateType.SYNC_FAILED.value);
+        error.setErrorMessage(e.getMessage());
+        taxMappingErrorService.insert(error);
     }
 }
@@ -3,22 +3,20 @@ package com.diligrp.tax.central.context;
 import com.diligrp.tax.central.event.RestoreTenantEvent;
 import com.diligrp.tax.central.model.TenantPipeline;
 import com.diligrp.tax.central.model.TenantPipelineConfig;
-import com.diligrp.tax.central.service.ITenantTaxService;
+import com.diligrp.tax.central.service.ITaxTenantService;
 import com.diligrp.tax.central.type.DocumentType;
 import com.diligrp.tax.central.type.SystemType;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 /**
@@ -31,20 +29,22 @@ import java.util.stream.Collectors;
 public class TenantStorageContext implements CommandLineRunner {
     @Resource
-    private ITenantTaxService tenantTaxService;
+    private ITaxTenantService tenantTaxService;
     @Resource
     private ApplicationEventPublisher publisher;
     private static final ConcurrentHashMap<Long, Map<SystemType, Map<String, TenantPipeline>>> TENANT_PIPELINE_MAP = new ConcurrentHashMap<>();
-    public static Optional<TenantPipeline> getTenantPipeline(Long tenantId, SystemType systemType, String pipelineCode) {
-        AtomicReference<TenantPipeline> pipeline = new AtomicReference<>();
-        Map<SystemType, Map<String, TenantPipeline>> tenantPipelineMap = TENANT_PIPELINE_MAP.get(tenantId);
-        Optional.ofNullable(tenantPipelineMap).ifPresent(map -> {
-            Map<String, TenantPipeline> pipelineMap = map.get(systemType);
-            Optional.ofNullable(pipelineMap).ifPresent(e -> pipeline.set(pipelineMap.get(pipelineCode)));
-        });
-        return Optional.of(pipeline.get());
+    public Optional<TenantPipeline> getTenantPipeline(Long tenantId, SystemType systemType, String pipelineCode) {
+        var tpMap = TENANT_PIPELINE_MAP.get(tenantId);
+        if (Objects.isNull(tpMap)) {
+            return Optional.empty();
+        }
+        Map<String, TenantPipeline> pipelineMap = tpMap.get(systemType);
+        if (Objects.isNull(pipelineMap)) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(pipelineMap.get(pipelineCode));
     }
     public void loadTenantPipeline() {
@@ -54,9 +54,4 @@ public class TaxPipelineMappingCreate {
      */
     @NotNull(message = "同步状态不能为空")
     private Integer state;
-
-    /**
-     * 错误信息
-     */
-    private String errorMessage;
 }
+package com.diligrp.tax.central.model;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-10 14:30
+ * @Version: todo
+ */
+@Getter
+@Setter
+public class TaxPipelineMappingError {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 分组
+     */
+    @NotEmpty
+    private String group;
+    /**
+     * 实体
+     */
+    @NotEmpty
+    private String entity;
+    /**
+     * 租户账套编码
+     */
+    @NotEmpty
+    private String pipelineCode;
+    /**
+     * 文档类型
+     */
+    @NotEmpty
+    private String documentType;
+    /**
+     * 系统类型
+     */
+    @NotEmpty
+    private String systemType;
+    /**
+     * 同步系统数据唯一键
+     */
+    @NotEmpty
+    private String systemDataId;
+    /**
+     * 原始发送数据
+     */
+    @NotEmpty
+    private String originData;
+    /**
+     * 同步状态
+     */
+    @NotNull
+    private Integer state;
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+}
@@ -33,10 +33,6 @@ public class TenantTaxPipelineMapping {
      */
     private String originData;
     /**
-     * 错误信息
-     */
-    private String errorMessage;
-    /**
      * 州
      */
     private Integer state;
+package com.diligrp.tax.central.service;
+
+import com.diligrp.tax.central.model.TaxPipelineMappingError;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-10 14:29
+ * @Version: todo
+ */
+public interface ITaxMappingErrorService {
+
+    /**
+     * 插入
+     *
+     * @param error 错误
+     */
+    void insert(TaxPipelineMappingError error);
+}
 package com.diligrp.tax.central.service;
-import com.diligrp.tax.central.domain.MessageContext;
 import com.diligrp.tax.central.model.TaxPipelineMappingCreate;
 import com.diligrp.tax.central.model.TenantTaxPipelineMapping;
-import org.springframework.validation.annotation.Validated;
 import java.util.Optional;
@@ -18,7 +16,7 @@ public interface ITaxPipelineMappingService {
      * @param systemDataId 系统数据 ID
      * @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);
     /**
      * 插入
@@ -10,7 +10,7 @@ import java.util.List;
  * @CreateTime: 2025-11-06 14:20
  * @Version: todo
  */
-public interface ITenantTaxService {
+public interface ITaxTenantService {
     /**
      * 获取租户 ID
@@ -50,7 +50,10 @@ public class CustomerBuilder extends Builder&lt;StandardCustomer&gt; {
         Optional.ofNullable(list).ifPresent(ts -> configureDefaultData(customer, ts));
         //查询数据库的客户信息 如果存在 赋值id
         Optional<TenantTaxPipelineMapping> dbOptions = taxPipelineMappingService.findByPipelineIdAndDocumentTypeAndSystemDataId(pipeline.getTenantId(), pipeline.getId(), markDocument().value, systemDataId);
-        dbOptions.ifPresent(e -> customer.setCustomerId(e.getPipelineDataId()));
+        dbOptions.ifPresent(e -> {
+            customer.setCustomerId(e.getPipelineDataId());
+            customer.setSystemDataId(e.getSystemDataId());
+        });
         return customer;
     }
+package com.diligrp.tax.storage.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-10 14:42
+ * @Version: todo
+ */
+@Setter
+@Getter
+@TableName(value = "tax_mapping_error")
+public class TaxMappingError {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 分组
+     */
+    @TableField(value = "`group`")
+    private String group;
+    /**
+     * 实体
+     */
+    @TableField(value = "entity")
+    private String entity;
+    /**
+     * 租户账套编码
+     */
+    @TableField(value = "pipeline_code")
+    private String pipelineCode;
+    /**
+     * 文档类型
+     */
+    @TableField(value = "document_type")
+    private String documentType;
+    /**
+     * 系统类型
+     */
+    @TableField(value = "system_type")
+    private String systemType;
+    /**
+     * 同步系统数据唯一键
+     */
+    @TableField(value = "system_data_id")
+    private String systemDataId;
+    /**
+     * 原始发送数据
+     */
+    @TableField(value = "origin_data")
+    private String originData;
+    /**
+     * 同步状态
+     */
+    @TableField(value = "state")
+    private Integer state;
+    /**
+     * 错误信息
+     */
+    @TableField(value = "error_message")
+    private String errorMessage;
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private LocalDateTime createdTime;
+    /**
+     * 修改时间
+     */
+    @TableField("modified_time")
+    private LocalDateTime modifiedTime;
+
+}
@@ -50,11 +50,6 @@ public class TaxPipelineMapping {
     private Integer state;
     /**
-     * 错误信息
-     */
-    private String errorMessage;
-
-    /**
      * 创建时间
      */
     private LocalDateTime createdTime;
+package com.diligrp.tax.storage.repo;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diligrp.tax.storage.domain.TaxMappingError;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TaxMappingErrorRepository extends BaseMapper<TaxMappingError> {
+}
+package com.diligrp.tax.storage.service;
+
+import com.diligrp.tax.central.model.TaxPipelineMappingError;
+import com.diligrp.tax.central.service.ITaxMappingErrorService;
+import com.diligrp.tax.central.utils.JsonUtils;
+import com.diligrp.tax.storage.domain.TaxMappingError;
+import com.diligrp.tax.storage.repo.TaxMappingErrorRepository;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-10 14:41
+ * @Version: todo
+ */
+@Service
+public class TaxMappingErrorService implements ITaxMappingErrorService {
+
+    @Resource
+    private TaxMappingErrorRepository taxMappingErrorRepository;
+
+    /**
+     * 插入
+     *
+     * @param error 错误
+     */
+    @Override
+    public void insert(TaxPipelineMappingError error) {
+        TaxMappingError save = JsonUtils.convertValue(error, TaxMappingError.class);
+        taxMappingErrorRepository.insert(save);
+    }
+}
@@ -4,16 +4,26 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
+import com.diligrp.tax.central.model.TenantPipeline;
+import com.diligrp.tax.central.model.TenantPipelineConfig;
+import com.diligrp.tax.central.service.ITaxTenantService;
+import com.diligrp.tax.central.type.SystemType;
+import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
+import com.diligrp.tax.storage.domain.TaxPipeline;
+import com.diligrp.tax.storage.domain.TaxPipelineConfig;
 import com.diligrp.tax.storage.domain.TaxTenant;
 import com.diligrp.tax.storage.model.co.TaxTenantCO;
 import com.diligrp.tax.storage.model.vo.TaxTenantVO;
+import com.diligrp.tax.storage.repo.TaxPipelineConfigRepository;
+import com.diligrp.tax.storage.repo.TaxPipelineRepository;
 import com.diligrp.tax.storage.repo.TaxTenantRepository;
 import com.diligrp.tax.storage.type.StateType;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
 import java.util.Optional;
 /**
@@ -23,12 +33,65 @@ import java.util.Optional;
  * @date 2025/11/05
  */
 @Service
-public class TaxTenantService {
+public class TaxTenantService implements ITaxTenantService {
     @Resource
     private TaxTenantRepository taxTenantRepository;
     @Resource
     private DynamicTaxPipelineMappingService dynamicTaxPipelineMappingService;
+    @Resource
+    private TaxPipelineRepository taxPipelineRepository;
+    @Resource
+    private TaxPipelineConfigRepository taxPipelineConfigRepository;
+
+
+    /**
+     * 获取租户 ID
+     *
+     * @param group  群
+     * @param entity 实体
+     * @return {@link Long }
+     */
+    @Override
+    public Long getTenantId(String group, String entity) {
+        LambdaQueryWrapper<TaxTenant> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaxTenant::getGroup, group);
+        queryWrapper.eq(TaxTenant::getEntity, entity);
+        TaxTenant taxTenant = taxTenantRepository.selectOne(queryWrapper);
+        return Optional.ofNullable(taxTenant).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.NO_TENANT_INFORMATION_FOUND)).getId();
+    }
+
+    /**
+     * 列出所有启用管道
+     *
+     * @return {@link List }<{@link TenantPipeline }>
+     */
+    @Override
+    public List<TenantPipeline> listAllEnablePipeline() {
+        LambdaQueryWrapper<TaxPipeline> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaxPipeline::getState, StateType.ENABLE.value);
+        List<TaxPipeline> taxPipelines = taxPipelineRepository.selectList(queryWrapper);
+        return taxPipelines.stream().map(taxPipeline -> {
+            TenantPipeline pipeline = JsonUtils.convertValue(taxPipeline, TenantPipeline.class);
+            pipeline.setSystemType(SystemType.from(taxPipeline.getSystemCode()));
+            return pipeline;
+        }).toList();
+    }
+
+    /**
+     * 按管道 ID 列出
+     *
+     * @param pipelineId
+     * @return {@link List }<{@link TenantPipelineConfig }>
+     */
+    @Override
+    public List<TenantPipelineConfig> listByPipelineId(Long pipelineId) {
+        LambdaQueryWrapper<TaxPipelineConfig> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaxPipelineConfig::getPipelineId, pipelineId);
+        List<TaxPipelineConfig> taxPipelineConfigs = taxPipelineConfigRepository.selectList(queryWrapper);
+        return taxPipelineConfigs.stream().map(taxPipelineConfig -> JsonUtils.convertValue(taxPipelineConfig, TenantPipelineConfig.class)).toList();
+    }
+
     /**
      * 获取租户
-package com.diligrp.tax.storage.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.diligrp.tax.central.exception.TaxAgentServiceException;
-import com.diligrp.tax.central.model.TenantPipeline;
-import com.diligrp.tax.central.model.TenantPipelineConfig;
-import com.diligrp.tax.central.service.ITenantTaxService;
-import com.diligrp.tax.central.type.SystemType;
-import com.diligrp.tax.central.type.TaxSystemType;
-import com.diligrp.tax.central.utils.JsonUtils;
-import com.diligrp.tax.storage.domain.TaxPipeline;
-import com.diligrp.tax.storage.domain.TaxPipelineConfig;
-import com.diligrp.tax.storage.domain.TaxTenant;
-import com.diligrp.tax.storage.repo.TaxPipelineConfigRepository;
-import com.diligrp.tax.storage.repo.TaxPipelineRepository;
-import com.diligrp.tax.storage.repo.TaxTenantRepository;
-import com.diligrp.tax.storage.type.StateType;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @Author: zhangmeiyang
- * @CreateTime: 2025-11-06 14:32
- * @Version: todo
- */
-@Service
-public class TenantTaxService implements ITenantTaxService {
-
-    @Resource
-    private TaxTenantRepository taxTenantRepository;
-
-    @Resource
-    private TaxPipelineRepository taxPipelineRepository;
-
-    @Resource
-    private TaxPipelineConfigRepository taxPipelineConfigRepository;
-
-    @Override
-    public Long getTenantId(String group, String entity) {
-        LambdaQueryWrapper<TaxTenant> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaxTenant::getGroup, group);
-        queryWrapper.eq(TaxTenant::getEntity, entity);
-        TaxTenant taxTenant = taxTenantRepository.selectOne(queryWrapper);
-        return Optional.ofNullable(taxTenant).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.NO_TENANT_INFORMATION_FOUND)).getId();
-    }
-
-    @Override
-    public List<TenantPipeline> listAllEnablePipeline() {
-        LambdaQueryWrapper<TaxPipeline> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaxPipeline::getState, StateType.ENABLE.value);
-        List<TaxPipeline> taxPipelines = taxPipelineRepository.selectList(queryWrapper);
-        return taxPipelines.stream().map(taxPipeline -> {
-            TenantPipeline pipeline = JsonUtils.convertValue(taxPipeline, TenantPipeline.class);
-            pipeline.setSystemType(SystemType.from(taxPipeline.getSystemCode()));
-            return pipeline;
-        }).toList();
-    }
-
-    @Override
-    public List<TenantPipelineConfig> listByPipelineId(Long pipelineId) {
-        LambdaQueryWrapper<TaxPipelineConfig> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaxPipelineConfig::getPipelineId, pipelineId);
-        List<TaxPipelineConfig> taxPipelineConfigs = taxPipelineConfigRepository.selectList(queryWrapper);
-        return taxPipelineConfigs.stream().map(taxPipelineConfig -> JsonUtils.convertValue(taxPipelineConfig, TenantPipelineConfig.class)).toList();
-    }
-}
@@ -9,7 +9,7 @@
                                             , pipeline_data_id
                                             , origin_data
                                             , state
-                                            , error_message)
+                                            )
         VALUES
             ( #{pipelineId}
             , #{documentType}
@@ -17,7 +17,7 @@
             , #{pipelineDataId}
             , #{originData}
             , #{state}
-            , #{errorMessage})
+            )
     </insert>
     <update id="updateStatus">
         UPDATE
@@ -36,7 +36,6 @@
         , pipeline_data_id
         , origin_data
         , state
-        , error_message
         , created_Time
         , modified_Time
         FROM
@@ -58,7 +57,6 @@
           , pipeline_data_id
           , origin_data
           , state
-          , error_message
           , created_Time
           , modified_Time
         FROM
@@ -80,7 +78,6 @@
             `system_data_id`   varchar(50)     NOT NULL COMMENT '系统数据ID',
             `pipeline_data_id` varchar(50)     NOT NULL COMMENT '账套数据ID',
             `origin_data`      json            NOT NULL COMMENT '原始数据',
-            `error_message`    text            NULL COMMENT '错误信息',
             `state`            tinyint         NOT NULL COMMENT '状态 0=已同步，1=同步失败，2=同步重试',
             `created_time`     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
             `modified_time`    datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',