refactor(tax): 调整租户配置加载逻辑与时间类型- 将 TaxPipelineConfig 中的时间类型从 Instant 改为 LocalDateTime

- 移除 TenantPipeline 的 @Builder 注解并调整 tenantPipelineConfigs 类型为 List 结构 - TenantStorageContext 实现 CommandLineRunner 接口以支持启动时加载配置 - 在 TenantTaxService 中补充 systemType 字段的设置逻辑- 添加 log 支持便于调试信息输出

refactor(tax): 调整租户配置加载逻辑与时间类型- 将 TaxPipelineConfig 中的时间类型从 Instant 改为 LocalDateTime
- 移除 TenantPipeline 的 @Builder 注解并调整 tenantPipelineConfigs 类型为 List 结构 - TenantStorageContext 实现 CommandLineRunner 接口以支持启动时加载配置 - 在 TenantTaxService 中补充 systemType 字段的设置逻辑- 添加 log 支持便于调试信息输出
zhangmeiyang
1 parent a285a3c8
Showing 4 changed files with 18 additions and 15 deletions
tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
tax-central/src/main/java/com/diligrp/tax/central/model/TenantPipeline.java
tax-storage/src/main/java/com/diligrp/tax/storage/domain/TaxPipelineConfig.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TenantTaxService.java
@@ -7,8 +7,10 @@ import com.diligrp.tax.central.service.ITenantTaxService;
 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;
  
@@ -24,8 +26,9 @@ import java.util.stream.Collectors;
  * @CreateTime: 2025-11-06 10:53
  * @Version: todo
  */
+@Slf4j
 @Component
-public class TenantStorageContext implements InitializingBean, DisposableBean {
+public class TenantStorageContext implements CommandLineRunner {
  
     @Resource
     private ITenantTaxService tenantTaxService;
@@ -66,17 +69,13 @@ public class TenantStorageContext implements InitializingBean, DisposableBean {
  
     private TenantPipeline loadConfig(TenantPipeline tenantPipeline) {
         List<TenantPipelineConfig> list = tenantTaxService.listByPipelineId(tenantPipeline.getId());
-        tenantPipeline.setTenantPipelineConfigs(list.stream().collect(Collectors.toMap(k -> DocumentType.from(k.getDocumentType()), v -> v)));
+        Map<DocumentType, List<TenantPipelineConfig>> collect = list.stream().collect(Collectors.groupingBy(k -> DocumentType.from(k.getDocumentType()), Collectors.toList()));
+        tenantPipeline.setTenantPipelineConfigs(collect);
         return tenantPipeline;
     }
  
     @Override
-    public void destroy() throws Exception {
-
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
+    public void run(String... args) throws Exception {
         publisher.publishEvent(new RestoreTenantEvent(this));
     }
 }
@@ -2,10 +2,10 @@ package com.diligrp.tax.central.model;
  
 import com.diligrp.tax.central.type.DocumentType;
 import com.diligrp.tax.central.type.SystemType;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
  
+import java.util.List;
 import java.util.Map;
  
 /**
@@ -15,7 +15,6 @@ import java.util.Map;
  */
 @Setter
 @Getter
-@Builder
 public class TenantPipeline {
     private Long id;
     private Long tenantId;
@@ -23,5 +22,5 @@ public class TenantPipeline {
     private String name;
     private String code;
     private Map<String, Object> params;
-    private Map<DocumentType, TenantPipelineConfig> tenantPipelineConfigs;
+    private Map<DocumentType, List<TenantPipelineConfig>> tenantPipelineConfigs;
 }
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
  
-import java.time.Instant;
+import java.time.LocalDateTime;
  
 @Getter
 @Setter
@@ -29,9 +29,9 @@ public class TaxPipelineConfig {
     private String configValue;
  
     @TableField(value = "created_time")
-    private Instant createdTime;
+    private LocalDateTime createdTime;
  
     @TableField(value = "modified_time")
-    private Instant modifiedTime;
+    private LocalDateTime modifiedTime;
  
 }
@@ -4,6 +4,7 @@ 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.type.SystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.storage.domain.TaxPipeline;
 import com.diligrp.tax.storage.domain.TaxPipelineConfig;
@@ -34,7 +35,11 @@ public class TenantTaxService implements ITenantTaxService {
         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();
+        return taxPipelines.stream().map(taxPipeline -> {
+            TenantPipeline pipeline = JsonUtils.convertValue(taxPipeline, TenantPipeline.class);
+            pipeline.setSystemType(SystemType.from(taxPipeline.getSystemCode()));
+            return pipeline;
+        }).toList();
     }
  
     @Override