feat(tenant): 集成Redis缓存优化租户管道配置存储

- 添加spring-boot-starter-data-redis依赖支持Redis功能 - 引入JsonUtils和TypeReference用于JSON序列化和反序列化 - 使用StringRedisTemplate替代ConcurrentHashMap存储租户管道配置 - 实现Redis键值结构tax:agent:tenant:pipeline::{tenantId}进行缓存管理 - 添加数据库兜底查询逻辑确保数据一致性 - 实现缓存加载时的Redis写入和日志记录功能 - 优化getTenantPipeline方法通过Redis缓存提高查询性能

feat(tenant): 集成Redis缓存优化租户管道配置存储
- 添加spring-boot-starter-data-redis依赖支持Redis功能 - 引入JsonUtils和TypeReference用于JSON序列化和反序列化 - 使用StringRedisTemplate替代ConcurrentHashMap存储租户管道配置 - 实现Redis键值结构tax:agent:tenant:pipeline::{tenantId}进行缓存管理 - 添加数据库兜底查询逻辑确保数据一致性 - 实现缓存加载时的Redis写入和日志记录功能 - 优化getTenantPipeline方法通过Redis缓存提高查询性能
张楣扬
1 parent 3271c6ee
Showing 2 changed files with 41 additions and 13 deletions
tax-central/pom.xml
tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
@@ -31,6 +31,10 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
@@ -3,17 +3,19 @@ package com.diligrp.tax.central.context;
 import com.diligrp.tax.central.model.PipelineDO;
 import com.diligrp.tax.central.service.ITenantService;
 import com.diligrp.tax.central.type.SystemType;
+import com.diligrp.tax.central.utils.JsonUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
+import org.springframework.data.redis.core.StringRedisTemplate;
 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.stream.Collectors;
  
 /**
@@ -25,29 +27,51 @@ import java.util.stream.Collectors;
 @Component
 public class TenantStorageContext {
  
+    // Redis中租户管道配置的Key前缀：tax:agent:tenant:pipeline::{tenantId}
+    private static final String TENANT_PIPELINE_KEY_PREFIX = "tax:agent:tenant:pipeline::";
+
     @Resource
     private ITenantService tenantService;
  
-    private static final ConcurrentHashMap<Long, Map<SystemType, Map<String, PipelineDO>>> TENANT_PIPELINE_MAP = new ConcurrentHashMap<>();
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    private String getTenantPipelineKey(Long tenantId) {
+        return TENANT_PIPELINE_KEY_PREFIX + tenantId;
+    }
+
+    /**
+     * 统一数据库兜底查询，并记录查询日志
+     * @param tenantId
+     * @param pipelineCode
+     * @param reason
+     * @return
+     */
+    private Optional<PipelineDO> queryPipelineFromDb(Long tenantId, String pipelineCode, String reason) {
+        Optional<PipelineDO> result = tenantService.findByTenantIdAndPipelineCode(tenantId, pipelineCode);
+        log.info("统一数据库兜底查询, tenantId:{}, pipelineCode:{}, found:{}", tenantId, pipelineCode, result.isPresent());
+        return result;
+    }
  
     public Optional<PipelineDO> getTenantPipeline(Long tenantId, SystemType systemType, String pipelineCode) {
-        var tpMap = TENANT_PIPELINE_MAP.get(tenantId);
-        if (Objects.isNull(tpMap)) {
-            return Optional.empty();
-        }
-        Map<String, PipelineDO> pipelineMap = tpMap.get(systemType);
-        if (Objects.isNull(pipelineMap)) {
-            return Optional.empty();
-        }
-        return Optional.ofNullable(pipelineMap.get(pipelineCode)).or(() -> tenantService.findByTenantIdAndPipelineCode(tenantId, pipelineCode));
+        return Optional.ofNullable(stringRedisTemplate.opsForValue().get(getTenantPipelineKey(tenantId)))
+                .map(json -> JsonUtils.fromJsonString(json, new TypeReference<Map<SystemType, Map<String, PipelineDO>>>() {}))
+                .map(tpMap -> Optional.ofNullable(tpMap.get(systemType))
+                        .flatMap(pipelineMap -> Optional.ofNullable(pipelineMap.get(pipelineCode))
+                                .or(() -> queryPipelineFromDb(tenantId, pipelineCode, "Redis中systemType或pipelineCode未命中"))))
+                .orElseGet(() -> queryPipelineFromDb(tenantId, pipelineCode, "Redis租户Key未命中"));
     }
  
     public void loadTenantPipeline() {
         List<PipelineDO> taxPipelineDOVOS = tenantService.listAllEnablePipeline();
         Optional.ofNullable(taxPipelineDOVOS).ifPresent(pipelines -> {
             var tenantPipelineMap = pipelines.stream().collect(Collectors.groupingBy(PipelineDO::getTenantId, Collectors.groupingBy(PipelineDO::getSystemTypeEnum, Collectors.toMap(PipelineDO::getCode, e -> e))));
-            TENANT_PIPELINE_MAP.clear();
-            TENANT_PIPELINE_MAP.putAll(tenantPipelineMap);
+            tenantPipelineMap.forEach((tenantId, pipelineMap) -> {
+                String tenantPipelineJson = JsonUtils.toJsonString(pipelineMap);
+                String redisKey = getTenantPipelineKey(tenantId);
+                stringRedisTemplate.opsForValue().set(redisKey, tenantPipelineJson);
+                log.info("redis写入缓存, key:{}, tenantId:{}, systemCount:{}", redisKey, tenantId, pipelineMap.size());
+            });
         });
     }