feat(storage): 新增根据租户ID和管道码查询功能

- 在ITaxTenantService接口中新增findByTenantIdAndPipelineCode方法 - 在TaxTenantService实现类中实现新的查询方法 - 优化TenantStorageContext上下文加载逻辑 - 移除CommandLineRunner接口改为使用ApplicationReadyEvent事件监听 - 更新租户管道查询逻辑，支持通过tenantId直接查询 - 清理无用的事件发布代码和相关依赖注入

feat(storage): 新增根据租户ID和管道码查询功能
- 在ITaxTenantService接口中新增findByTenantIdAndPipelineCode方法 - 在TaxTenantService实现类中实现新的查询方法 - 优化TenantStorageContext上下文加载逻辑 - 移除CommandLineRunner接口改为使用ApplicationReadyEvent事件监听 - 更新租户管道查询逻辑，支持通过tenantId直接查询 - 清理无用的事件发布代码和相关依赖注入
zhangmeiyang
1 parent aed69510
Showing 4 changed files with 18 additions and 34 deletions
tax-boot/src/main/resources/application.properties
tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITaxTenantService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TaxTenantService.java
@@ -11,21 +11,3 @@ spring.cloud.nacos.config.server-addr=nacos.diligrp.com:8848
 spring.cloud.nacos.config.namespace=54c39cfe-d1c4-4022-a94b-a3486c5927fc
 spring.config.import[0]=nacos:${spring.application.name}.properties
 spring.config.import[1]=nacos:${spring.application.name}-${spring.profiles.active}.properties
-#mybatis-plus
-logging.config=classpath:logback-spring.xml
-mybatis-plus.mapper-locations=classpath*:com/diligrp/tax/**/repo/*.xml
-mybatis-plus.configuration.map-underscore-to-camel-case=true
-mybatis-plus.configuration.cache-enabled=true
-mybatis-plus.global-config.banner=false
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://mysql.diligrp.com:3306/dili_tax?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=OTM0NjAwMTMyMjZlNzgy
-spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.pool-name=ErpHikariPool
-spring.datasource.hikari.minimum-idle=4
-spring.datasource.hikari.maximum-pool-size=60
-spring.datasource.hikari.idle-timeout=120000
-spring.datasource.hikari.max-lifetime=900000
-spring.datasource.hikari.connection-timeout=15000
-spring.datasource.hikari.connection-test-query=SELECT 1
 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.service.ITaxTenantService;
 import com.diligrp.tax.central.type.SystemType;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
  
 import java.util.List;
@@ -24,12 +24,10 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Component
-public class TenantStorageContext implements CommandLineRunner {
+public class TenantStorageContext {
  
     @Resource
     private ITaxTenantService tenantTaxService;
-    @Resource
-    private ApplicationEventPublisher publisher;
  
     private static final ConcurrentHashMap<Long, Map<SystemType, Map<String, TenantPipeline>>> TENANT_PIPELINE_MAP = new ConcurrentHashMap<>();
  
@@ -42,24 +40,16 @@ public class TenantStorageContext implements CommandLineRunner {
         if (Objects.isNull(pipelineMap)) {
             return Optional.empty();
         }
-        return Optional.ofNullable(pipelineMap.get(pipelineCode));
+        return Optional.ofNullable(pipelineMap.get(pipelineCode)).or(() -> tenantTaxService.findByTenantIdAndPipelineCode(tenantId, pipelineCode));
     }
  
+    @EventListener(ApplicationReadyEvent.class)
     public void loadTenantPipeline() {
         List<TenantPipeline> taxPipelineVOS = tenantTaxService.listAllEnablePipeline();
         Optional.ofNullable(taxPipelineVOS).ifPresent(pipelines -> {
-            var tenantPipelineMap = pipelines.stream()
-                    .collect(Collectors.groupingBy(TenantPipeline::getTenantId,
-                            Collectors.groupingBy(TenantPipeline::getSystemType,
-                                    Collectors.toMap(TenantPipeline::getCode, e -> e)))
-                    );
+            var tenantPipelineMap = pipelines.stream().collect(Collectors.groupingBy(TenantPipeline::getTenantId, Collectors.groupingBy(TenantPipeline::getSystemType, Collectors.toMap(TenantPipeline::getCode, e -> e))));
             TENANT_PIPELINE_MAP.clear();
             TENANT_PIPELINE_MAP.putAll(tenantPipelineMap);
         });
     }
-
-    @Override
-    public void run(String... args) throws Exception {
-        publisher.publishEvent(new RestoreTenantEvent(this));
-    }
 }
@@ -38,6 +38,13 @@ public interface ITaxTenantService {
     Optional<TenantPipeline> findByTenantAndPipelineCode(String group,String entity,String pipelineCode);
  
     /**
+     * 列出所有启用管道
+     *
+     * @return {@link List }<{@link TenantPipeline }>
+     */
+    Optional<TenantPipeline> findByTenantIdAndPipelineCode(Long tenantId,String pipelineCode);
+
+    /**
      * 按管道 ID 列出
      *
      * @param pipelineId   管道 ID
@@ -79,6 +79,11 @@ public class TaxTenantService implements ITaxTenantService {
     @Override
     public Optional<TenantPipeline> findByTenantAndPipelineCode(String group, String entity, String pipelineCode) {
         Long tenantId = getTenantId(group, entity);
+        return findByTenantIdAndPipelineCode(tenantId, pipelineCode);
+    }
+
+    @Override
+    public Optional<TenantPipeline> findByTenantIdAndPipelineCode(Long tenantId, String pipelineCode) {
         LambdaQueryWrapper<TaxPipeline> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaxPipeline::getCode, pipelineCode);
         queryWrapper.eq(TaxPipeline::getTenantId, tenantId);