refactor(storage):重构租户管道配置相关类包结构和依赖关系

- 将 ConnectionIdentity 接口从 storage 包移动到 central 包 - 将 RestoreTenantEvent 和 RestoreTenantEventListener 移动到 central 包并更新引用 -重命名 TaxPipelineConfigVO 为 TenantPipelineConfig 并调整字段注释 - 更新 TenantPipeline 类的包路径和依赖引用 - 引入 ITenantTaxService 接口及其实现类 TenantTaxService - 调整 TenantStorageContext 中的依赖注入和服务调用方式 - 删除旧的 TaxPipelineService 和 TaxPipelineConfigService 依赖 - 新增 listAllEnablePipeline 和 listByPipelineId 方法实现数据转换逻辑

refactor(storage):重构租户管道配置相关类包结构和依赖关系
- 将 ConnectionIdentity 接口从 storage 包移动到 central 包 - 将 RestoreTenantEvent 和 RestoreTenantEventListener 移动到 central 包并更新引用 -重命名 TaxPipelineConfigVO 为 TenantPipelineConfig 并调整字段注释 - 更新 TenantPipeline 类的包路径和依赖引用 - 引入 ITenantTaxService 接口及其实现类 TenantTaxService - 调整 TenantStorageContext 中的依赖注入和服务调用方式 - 删除旧的 TaxPipelineService 和 TaxPipelineConfigService 依赖 - 新增 listAllEnablePipeline 和 listByPipelineId 方法实现数据转换逻辑
zhangmeiyang
1 parent fab6c9ab
Showing 9 changed files with 167 additions and 41 deletions
tax-storage/src/main/java/com/diligrp/tax/storage/context/TenantStorageContext.java → tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
tax-storage/src/main/java/com/diligrp/tax/storage/event/RestoreTenantEvent.java → tax-central/src/main/java/com/diligrp/tax/central/event/RestoreTenantEvent.java
tax-storage/src/main/java/com/diligrp/tax/storage/event/RestoreTenantEventListener.java → tax-central/src/main/java/com/diligrp/tax/central/event/RestoreTenantEventListener.java
tax-storage/src/main/java/com/diligrp/tax/storage/context/ConnectionIdentity.java → tax-central/src/main/java/com/diligrp/tax/central/interfaces/ConnectionIdentity.java
tax-storage/src/main/java/com/diligrp/tax/storage/context/TenantPipeline.java → tax-central/src/main/java/com/diligrp/tax/central/model/TenantPipeline.java
tax-central/src/main/java/com/diligrp/tax/central/model/TenantPipelineConfig.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITenantTaxService.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/vo/TaxPipelineConfigVO.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TenantTaxService.java
-package com.diligrp.tax.storage.context;
+package com.diligrp.tax.central.context;
  
+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.storage.model.vo.TaxPipelineVO;
-import com.diligrp.tax.storage.service.TaxPipelineConfigService;
-import com.diligrp.tax.storage.service.TaxPipelineService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
  
@@ -23,14 +23,11 @@ import java.util.stream.Collectors;
 public class TenantStorageContext {
  
     @Resource
-    private TaxPipelineService taxPipelineService;
-
-    @Resource
-    private TaxPipelineConfigService taxPipelineConfigService;
+    private ITenantTaxService tenantTaxService;
  
     private static final ConcurrentHashMap<Long, Map<SystemType, Map<String, TenantPipeline>>> TENANT_PIPELINE_MAP = new ConcurrentHashMap<>();
  
-    public Optional<TenantPipeline> getTenantPipeline(Long tenantId, SystemType systemType, String pipelineCode) {
+    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 -> {
@@ -44,16 +41,16 @@ public class TenantStorageContext {
  
  
     public void loadTenantPipeline() {
-        List<TaxPipelineVO> taxPipelineVOS = taxPipelineService.listAllEnablePipeline();
+        List<TenantPipeline> taxPipelineVOS = tenantTaxService.listAllEnablePipeline();
         Optional.ofNullable(taxPipelineVOS).ifPresent(pipelines -> {
             Map<Long, Map<SystemType, Map<String, TenantPipeline>>> tenantPipelineMap = pipelines.stream()
                     .collect(Collectors.groupingBy(
-                            TaxPipelineVO::getTenantId,
+                            TenantPipeline::getTenantId,
                             Collectors.groupingBy(
-                                    e -> SystemType.from(e.getSystemCode()),
+                                    TenantPipeline::getSystemType,
                                     Collectors.toMap(
-                                            TaxPipelineVO::getCode,
-                                            this::convert,
+                                            TenantPipeline::getCode,
+                                            this::loadConfig,
                                             (existing, replacement) -> existing
                                     )
                             )
@@ -64,12 +61,9 @@ public class TenantStorageContext {
     }
  
  
-    private TenantPipeline convert(TaxPipelineVO taxPipelineVO) {
-        return TenantPipeline.builder()
-                .code(taxPipelineVO.getCode())
-                .name(taxPipelineVO.getName())
-                .params(taxPipelineVO.getParams())
-                .taxPipelineConfigs(taxPipelineConfigService.listByPipelineId(taxPipelineVO.getId()))
-                .build();
+    private TenantPipeline loadConfig(TenantPipeline tenantPipeline) {
+        List<TenantPipelineConfig> list = tenantTaxService.listByPipelineId(tenantPipeline.getId());
+        tenantPipeline.setTenantPipelineConfigs(list);
+        return tenantPipeline;
     }
 }
-package com.diligrp.tax.storage.event;
+package com.diligrp.tax.central.event;
  
 import org.springframework.context.ApplicationEvent;
  
-package com.diligrp.tax.storage.event;
+package com.diligrp.tax.central.event;
  
-import com.diligrp.tax.storage.context.TenantStorageContext;
+import com.diligrp.tax.central.context.TenantStorageContext;
 import jakarta.annotation.Resource;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
-package com.diligrp.tax.storage.context;
+package com.diligrp.tax.central.interfaces;
  
 public interface ConnectionIdentity<T> {
  
-package com.diligrp.tax.storage.context;
+package com.diligrp.tax.central.model;
  
+import com.diligrp.tax.central.interfaces.ConnectionIdentity;
+import com.diligrp.tax.central.type.SystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
-import com.diligrp.tax.storage.model.vo.TaxPipelineConfigVO;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,10 +20,13 @@ import java.util.Map;
 @Getter
 @Builder
 public class TenantPipeline implements ConnectionIdentity<IdentifyInfo> {
+    private Long id;
+    private Long tenantId;
+    private SystemType systemType;
     private String name;
     private String code;
     private Map<String, Object> params;
-    private List<TaxPipelineConfigVO> taxPipelineConfigs;
+    private List<TenantPipelineConfig> tenantPipelineConfigs;
  
     @Override
     public IdentifyInfo getIdentity() {
+package com.diligrp.tax.central.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-06 14:25
+ * @Version: todo
+ */
+@Getter
+@Setter
+public class TenantPipelineConfig {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 管道 ID
+     */
+    private Long pipelineId;
+    /**
+     * 文档类型
+     */
+    private String documentType;
+    /**
+     * 配置键
+     */
+    private String configKey;
+    /**
+     * 配置值
+     */
+    private String configValue;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifiedTime;
+}
+package com.diligrp.tax.central.service;
+
+import com.diligrp.tax.central.model.TenantPipeline;
+import com.diligrp.tax.central.model.TenantPipelineConfig;
+
+import java.util.List;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-06 14:20
+ * @Version: todo
+ */
+public interface ITenantTaxService {
+
+    /**
+     * 列出所有启用管道
+     *
+     * @return {@link List }<{@link TenantPipeline }>
+     */
+    List<TenantPipeline> listAllEnablePipeline();
+
+    /**
+     * 按管道 ID 列出
+     *
+     * @param pipelineId 管道 ID
+     * @return {@link List }<{@link TenantPipelineConfig }>
+     */
+    List<TenantPipelineConfig> listByPipelineId(Long pipelineId);
+}
@@ -9,25 +9,33 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 public class TaxPipelineConfigVO {
-
+    /**
+     * id
+     */
     private Long id;
-
-
+    /**
+     * 管道 ID
+     */
     private Long pipelineId;
-
-
+    /**
+     * 文档类型
+     */
     private String documentType;
-
-
+    /**
+     * 配置键
+     */
     private String configKey;
-
-
+    /**
+     * 配置值
+     */
     private String configValue;
-
-
+    /**
+     * 创建时间
+     */
     private LocalDateTime createdTime;
-
-
+    /**
+     * 修改时间
+     */
     private LocalDateTime modifiedTime;
  
 }
+package com.diligrp.tax.storage.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.utils.JsonUtils;
+import com.diligrp.tax.storage.domain.TaxPipeline;
+import com.diligrp.tax.storage.domain.TaxPipelineConfig;
+import com.diligrp.tax.storage.repo.TaxPipelineConfigRepository;
+import com.diligrp.tax.storage.repo.TaxPipelineRepository;
+import com.diligrp.tax.storage.type.StateType;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-11-06 14:32
+ * @Version: todo
+ */
+@Service
+public class TenantTaxService implements ITenantTaxService {
+
+    @Resource
+    private TaxPipelineRepository taxPipelineRepository;
+
+    @Resource
+    private TaxPipelineConfigRepository taxPipelineConfigRepository;
+
+    @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 -> JsonUtils.convertValue(taxPipeline, TenantPipeline.class)).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();
+    }
+}