refactor(system): 重构系统类型字段命名及验证逻辑

- 将 systemCode 字段统一更名为 systemType - 修改 SystemType 枚举验证方法名 validateSystemCode 为 validateSystemType - 更新 PipelineDO 中 systemType 字段类型为 systemTypeEnum - 调整 TenantService 中获取管道信息时的系统类型转换逻辑 - 优化 PipelineMappingRepository 接口参数传递方式和 SQL 查询条件 - 增加 MyBatis Plus 分页插件配置支持 - 引入 mybatis-plus-jsqlparser 依赖以增强 SQL 解析能力 - 完善租户查询逻辑，增加异常处理和 ID 设置机制

refactor(system): 重构系统类型字段命名及验证逻辑
- 将 systemCode 字段统一更名为 systemType - 修改 SystemType 枚举验证方法名 validateSystemCode 为 validateSystemType - 更新 PipelineDO 中 systemType 字段类型为 systemTypeEnum - 调整 TenantService 中获取管道信息时的系统类型转换逻辑 - 优化 PipelineMappingRepository 接口参数传递方式和 SQL 查询条件 - 增加 MyBatis Plus 分页插件配置支持 - 引入 mybatis-plus-jsqlparser 依赖以增强 SQL 解析能力 - 完善租户查询逻辑，增加异常处理和 ID 设置机制
zhangmeiyang
1 parent bb1d2690
Showing 16 changed files with 74 additions and 38 deletions
pom.xml
tax-adopt/src/main/java/com/diligrp/tax/adopt/service/impl/AdoptMessageServiceImpl.java
tax-central/src/main/java/com/diligrp/tax/central/context/TenantStorageContext.java
tax-central/src/main/java/com/diligrp/tax/central/model/PipelineDO.java
tax-central/src/main/java/com/diligrp/tax/central/type/SystemType.java
tax-storage/pom.xml
tax-storage/src/main/java/com/diligrp/tax/storage/StorageConfig.java
tax-storage/src/main/java/com/diligrp/tax/storage/domain/Pipeline.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/PipelineCO.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TenantCO.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/vo/PipelineVO.java
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineMappingRepository.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/PipelineMappingService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/PipelineService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TenantService.java
tax-storage/src/main/resources/com/diligrp/tax/storage/repo/PipelineMappingRepository.xml
@@ -45,6 +45,11 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
             <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring-boot.version}</version>
@@ -61,7 +61,7 @@ public class AdoptMessageServiceImpl implements AdoptMessageService {
             receiveMessageCO.setMsgBody(map);
         }
         Optional<PipelineDO> byTenantAndPipelineCode = tenantService.findByTenantAndPipelineCode(receiveMessageCO.getGroup(), receiveMessageCO.getEntity(), receiveMessageCO.getPipelineCode());
-        byTenantAndPipelineCode.ifPresent(tenantPipeline -> receiveMessageCO.setSystemType(tenantPipeline.getSystemType().code));
+        byTenantAndPipelineCode.ifPresent(tenantPipeline -> receiveMessageCO.setSystemType(tenantPipeline.getSystemTypeEnum().code));
         // 发送mq
         String messageJson = JsonUtils.toJsonString(receiveMessageCO);
         rabbitTemplate.convertAndSend(NORMAL_EXCHANGE, NORMAL_ROUTING, messageJson);
@@ -88,7 +88,7 @@ public class AdoptMessageServiceImpl implements AdoptMessageService {
     }
  
     private static ReceiveMessageCO getReceiveMessageCO(String group, String entity, String pipelineCode, String documentType, Map<String, Object> map, PipelineDO pipelineDO) {
-        var msgBody = switch (pipelineDO.getSystemType()) {
+        var msgBody = switch (pipelineDO.getSystemTypeEnum()) {
             case KING_DEE -> kingdeeMap(map);
             case YONG_YOU -> throw new TaxAgentServiceException(TaxSystemType.ABNORMAL_PARAMETERS, "未支持的系统形式");
         };
@@ -98,7 +98,7 @@ public class AdoptMessageServiceImpl implements AdoptMessageService {
         receiveMessageCO.setGroup(group);
         receiveMessageCO.setEntity(entity);
         receiveMessageCO.setPipelineCode(pipelineCode);
-        receiveMessageCO.setSystemType(pipelineDO.getSystemType().code);
+        receiveMessageCO.setSystemType(pipelineDO.getSystemTypeEnum().code);
         receiveMessageCO.setDocumentType(documentType);
         receiveMessageCO.setMsgBody(msgBody);
         return receiveMessageCO;
@@ -45,7 +45,7 @@ public class TenantStorageContext {
     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::getSystemType, Collectors.toMap(PipelineDO::getCode, e -> e))));
+            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);
         });
@@ -16,7 +16,7 @@ import java.util.Map;
 public class PipelineDO {
     private Long id;
     private Long tenantId;
-    private SystemType systemType;
+    private SystemType systemTypeEnum;
     private String name;
     private String code;
     private Map<String, Object> params;
@@ -28,7 +28,7 @@ public enum SystemType {
         throw new IllegalArgumentException("Invalid SystemType code: " + code);
     }
  
-    public static void validateSystemCode(String code){
+    public static void validateSystemType(String code){
         for (SystemType systemType : SystemType.values()){
             if (systemType.code.equals(code)){
                 return;
@@ -26,6 +26,10 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 package com.diligrp.tax.storage;
  
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
  
@@ -13,4 +17,15 @@ import org.springframework.context.annotation.Configuration;
 @ComponentScan(basePackages = "com.diligrp.tax.storage")
 @MapperScan(basePackages = "com.diligrp.tax.storage.repo")
 public class StorageConfig {
+
+    /**
+     * 添加分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加
+        // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType
+        return interceptor;
+    }
 }
@@ -27,8 +27,8 @@ public class Pipeline {
     @TableField("tenant_id")
     private Long tenantId;
  
-    @TableField("system_code")
-    private String systemCode;
+    @TableField("system_type")
+    private String systemType;
  
     @TableField("name")
     private String name;
@@ -39,7 +39,7 @@ public class PipelineCO {
      * 账套类型
      */
     @NotEmpty(groups = {Valid.Create.class})
-    private String systemCode;
+    private String systemType;
     /**
      * 账套名字
      */
@@ -18,7 +18,6 @@ public class TenantCO extends PageQuery {
     /**
      * id
      */
-    @NotNull(groups = {Valid.Update.class, Valid.Delete.class, Valid.Read.class})
     private Long id;
     /**
      * 名字
@@ -20,7 +20,7 @@ public class PipelineVO {
     /**
      * 系统代码
      */
-    private String systemCode;
+    private String systemType;
     /**
      * 名字
      */
@@ -3,6 +3,7 @@ package com.diligrp.tax.storage.repo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diligrp.tax.central.model.PipelineMappingDO;
+import com.diligrp.tax.storage.domain.PipelineMapping;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
  
@@ -17,30 +18,31 @@ public interface PipelineMappingRepository {
      *
      * @param mapping 税务管道映射
      */
-    void insert(com.diligrp.tax.storage.domain.PipelineMapping mapping);
+    void insert(PipelineMapping mapping);
  
     /**
      * 更新
      *
      * @param mapping 税务管道映射
      */
-    void updateStatus(com.diligrp.tax.storage.domain.PipelineMapping mapping);
+    void updateStatus(@Param("mapping") PipelineMapping mapping, @Param("tenantId") Long tenantId);
  
     /**
      * 按管道 ID 查找
      *
      * @param mapping 税务管道映射
-     * @return {@link List }<{@link com.diligrp.tax.storage.domain.PipelineMapping }>
+     * @param page    页
+     * @return {@link List }<{@link PipelineMapping }>
      */
-    Page<PipelineMappingDO> findByPipelineIdAndState(com.diligrp.tax.storage.domain.PipelineMapping mapping, IPage<?> page);
+    Page<PipelineMappingDO> findByPipelineIdAndState(@Param("mapping")PipelineMapping mapping,@Param("page") IPage<?> page);
  
     /**
      * 按管道 ID 和系统数据 ID 查找
      *
      * @param mapping 映射
-     * @return {@link Optional }<{@link com.diligrp.tax.storage.domain.PipelineMapping }>
+     * @return {@link Optional }<{@link PipelineMapping }>
      */
-    Optional<PipelineMappingDO> findByPipelineIdAndDocumentTypeAndSystemDataId(com.diligrp.tax.storage.domain.PipelineMapping mapping);
+    Optional<PipelineMappingDO> findByPipelineIdAndDocumentTypeAndSystemDataId(PipelineMapping mapping);
  
     /**
      * 通过管道ID、文档类型以及系统数据ID和管道数据ID查找
@@ -48,7 +50,7 @@ public interface PipelineMappingRepository {
      * @param pipelineMapping 税收管道映射
      * @return {@link Optional }<{@link PipelineMappingDO }>
      */
-    Optional<PipelineMappingDO> findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(com.diligrp.tax.storage.domain.PipelineMapping pipelineMapping);
+    Optional<PipelineMappingDO> findByPipelineIdAndDocumentTypeAndSystemDataIdAndPipelineDataId(PipelineMapping pipelineMapping);
  
  
     /**
@@ -70,6 +72,6 @@ public interface PipelineMappingRepository {
      *
      * @param pipelineMapping 税务管道映射
      */
-    void update(com.diligrp.tax.storage.domain.PipelineMapping pipelineMapping);
+    void update(PipelineMapping pipelineMapping);
  
 }
 package com.diligrp.tax.storage.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.model.PipelineMappingCreateDO;
@@ -10,8 +11,10 @@ import com.diligrp.tax.central.type.MappingStateType;
 import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.storage.domain.PipelineMapping;
+import com.diligrp.tax.storage.domain.Tenant;
 import com.diligrp.tax.storage.model.co.PipelineMappingCO;
 import com.diligrp.tax.storage.repo.PipelineMappingRepository;
+import com.diligrp.tax.storage.repo.TenantRepository;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +34,9 @@ public class PipelineMappingService implements IPipelineMappingService {
     @Resource
     private PipelineMappingRepository pipelineMappingRepository;
  
+    @Resource
+    private TenantRepository tenantRepository;
+
     private static final String DEFAULT_PIPELINE_MAPPING_TABLE_NAME = "pipeline_mapping_";
  
     /**
@@ -52,11 +58,16 @@ public class PipelineMappingService implements IPipelineMappingService {
      * @return {@link List }<{@link PipelineMappingDO }>
      */
     public Page<PipelineMappingDO> findTenantPipelineData(PipelineMappingCO pipelineMappingCO) {
-        Optional.ofNullable(pipelineMappingCO.getTenantId()).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "租户ID不能为空"));
+        LambdaQueryWrapper<Tenant> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Tenant::getGroup, pipelineMappingCO.getGroup());
+        queryWrapper.eq(Tenant::getEntity, pipelineMappingCO.getEntity());
+        Tenant tenant = Optional.ofNullable(tenantRepository.selectOne(queryWrapper)).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.NO_TENANT_INFORMATION_FOUND));
         Optional.ofNullable(pipelineMappingCO.getPipelineId()).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION, "管道ID不能为空"));
+        pipelineMappingCO.setTenantId(tenant.getId());
+        pipelineMappingCO.setState(MappingStateType.SYNCED.value);
         Page<PipelineMappingDO> page = new Page<>(pipelineMappingCO.getPageNumber(), pipelineMappingCO.getPageSize());
         PipelineMapping pipelineMapping = JsonUtils.convertValue(pipelineMappingCO, PipelineMapping.class);
-        return pipelineMappingRepository.findByPipelineIdAndState(pipelineMapping, page);
+        return pipelineMappingRepository.findByPipelineIdAndState(pipelineMapping,page);
     }
  
     /**
@@ -50,7 +50,7 @@ public class PipelineService {
             throw new TaxAgentServiceException(TaxSystemType.ABNORMAL_PARAMETERS,"当前账套编码已存在");
         });
         pipelineCO.setTenantId(tenant.getId());
-        SystemType.validateSystemCode(pipelineCO.getSystemCode());
+        SystemType.validateSystemType(pipelineCO.getSystemType());
         Pipeline pipeline = JsonUtils.convertValue(pipelineCO, Pipeline.class);
         pipeline.setState(StateType.ENABLE.value);
         pipelineRepository.insert(pipeline);
@@ -64,7 +64,7 @@ public class PipelineService {
      */
     @Transactional
     public void update(PipelineCO pipelineCO) {
-        SystemType.validateSystemCode(pipelineCO.getSystemCode());
+        Optional.ofNullable(pipelineCO.getSystemType()).ifPresent(SystemType::validateSystemType);
         Pipeline pipeline = JsonUtils.convertValue(pipelineCO, Pipeline.class);
         pipelineRepository.updateById(pipeline);
     }
@@ -66,12 +66,12 @@ public class TenantService implements ITenantService {
      */
     @Override
     public List<PipelineDO> listAllEnablePipeline() {
-        LambdaQueryWrapper<com.diligrp.tax.storage.domain.Pipeline> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(com.diligrp.tax.storage.domain.Pipeline::getState, StateType.ENABLE.value);
-        List<com.diligrp.tax.storage.domain.Pipeline> pipelines = pipelineRepository.selectList(queryWrapper);
-        return pipelines.stream().map(taxPipeline -> {
-            PipelineDO pipelineDO = JsonUtils.convertValue(taxPipeline, PipelineDO.class);
-            pipelineDO.setSystemType(SystemType.from(taxPipeline.getSystemCode()));
+        LambdaQueryWrapper<Pipeline> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Pipeline::getState, StateType.ENABLE.value);
+        List<Pipeline> pipelines = pipelineRepository.selectList(queryWrapper);
+        return pipelines.stream().map(pipeline -> {
+            PipelineDO pipelineDO = JsonUtils.convertValue(pipeline, PipelineDO.class);
+            pipelineDO.setSystemTypeEnum(SystemType.from(pipeline.getSystemType()));
             return pipelineDO;
         }).toList();
     }
@@ -89,7 +89,7 @@ public class TenantService implements ITenantService {
         queryWrapper.eq(Pipeline::getTenantId, tenantId);
         return Optional.ofNullable(pipelineRepository.selectOne(queryWrapper)).map(taxPipeline -> {
             PipelineDO pipelineDO = JsonUtils.convertValue(taxPipeline, PipelineDO.class);
-            pipelineDO.setSystemType(SystemType.from(taxPipeline.getSystemCode()));
+            pipelineDO.setSystemTypeEnum(SystemType.from(taxPipeline.getSystemType()));
             return pipelineDO;
         });
     }
@@ -117,7 +117,7 @@ public class TenantService implements ITenantService {
         LambdaQueryWrapper<Tenant> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Tenant::getGroup, group);
         queryWrapper.eq(Tenant::getEntity, entity);
-        Tenant tenant = Optional.ofNullable(tenantRepository.selectOne(queryWrapper)).orElseThrow(() -> new TaxAgentServiceException("未找到租户信息"));
+        Tenant tenant = Optional.ofNullable(tenantRepository.selectOne(queryWrapper)).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.INCORRECT_BUSINESS_PROCESSES,"未找到租户信息"));
         return JsonUtils.convertValue(tenant, TenantVO.class);
     }
  
@@ -141,6 +141,8 @@ public class TenantService implements ITenantService {
      */
     @Transactional
     public void updateTenant(TenantCO tenantCO) {
+        TenantVO tenant1 = getTenant(tenantCO.getGroup(), tenantCO.getEntity());
+        tenantCO.setId(tenant1.getId());
         Tenant tenant = JsonUtils.convertValue(tenantCO, Tenant.class);
         tenantRepository.updateById(tenant);
     }
@@ -23,9 +23,9 @@
         UPDATE
             pipeline_mapping_${tenantId}
         SET
-            state = #{state}
+            state = #{mapping.state}
         WHERE
-            id = #{id}
+            id = #{mapping.id}
     </update>
     <select id="findByPipelineIdAndState" resultType="com.diligrp.tax.central.model.PipelineMappingDO">
         SELECT
@@ -39,13 +39,11 @@
         , created_Time
         , modified_Time
         FROM
-        pipeline_mapping_${tenantId}
+        pipeline_mapping_${mapping.tenantId}
         WHERE
         1=1
-        AND pipeline_id = #{pipelineId}
-        <if test="state != null">
-            AND state = #{state}
-        </if>
+        AND pipeline_id = #{mapping.pipelineId}
+        AND state = #{mapping.state}
     </select>
     <select id="findByPipelineIdAndDocumentTypeAndSystemDataId"
             resultType="com.diligrp.tax.central.model.PipelineMappingDO">