erp / tax-agent · Commits

Commit 370056a9e6fbf9bbd3adb30ee393d986232dbc46

Authored by zhangmeiyang
1 parent c328ae31
build: skipped

refactor(storage):重构消息和验证类包结构并新增业务关键词功能- 将 Message 和 Valid 类从 storage 包迁移至 centr… 

…al.message 包- 更新所有相关导入路径以反映新的包结构
- 新增 TaxPipelineBusinessKeyword 领域模型及相关仓储、服务类- 添加单据类型、字段及取值方式等业务关键词配置支持
- 调整 PageQuery 类的包归属并移除冗余 import语句
Inline Side-by-side
Showing 23 changed files with 119 additions and 30 deletions
tax-storage/src/main/java/com/diligrp/tax/storage/message/Message.java renamed to tax-central/src/main/java/com/diligrp/tax/central/message/Message.java
  View file @370056a
1   -package com.diligrp.tax.storage.message;
  1 +package com.diligrp.tax.central.message;
2 2  
3 3 import lombok.Getter;
4 4 import lombok.Setter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/message/PageQuery.java renamed to tax-central/src/main/java/com/diligrp/tax/central/message/PageQuery.java
  View file @370056a
1   -package com.diligrp.tax.storage.message;
  1 +package com.diligrp.tax.central.message;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4 3 import jakarta.validation.constraints.NotNull;
5 4 import lombok.Getter;
6 5 import lombok.Setter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/Valid.java renamed to tax-central/src/main/java/com/diligrp/tax/central/message/Valid.java
  View file @370056a
1   -package com.diligrp.tax.storage;
  1 +package com.diligrp.tax.central.message;
2 2  
3 3 /**
4 4 * 标记接口
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/GlobalExceptionHandler.java
  View file @370056a
... ... @@ -2,7 +2,7 @@ package com.diligrp.tax.storage;
2 2  
3 3 import com.diligrp.tax.central.exception.TaxAgentServiceException;
4 4 import com.diligrp.tax.central.type.TaxSystemType;
5   -import com.diligrp.tax.storage.message.Message;
  5 +import com.diligrp.tax.central.message.Message;
6 6 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
7 7 import jakarta.validation.ConstraintViolation;
8 8 import jakarta.validation.ConstraintViolationException;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/api/PipelineBusinessApi.java
  View file @370056a
... ... @@ -2,7 +2,7 @@ package com.diligrp.tax.storage.api;
2 2  
3 3 import com.diligrp.tax.storage.api.request.PipelineBusinessRequest;
4 4 import com.diligrp.tax.storage.api.service.PipelineBusinessService;
5   -import com.diligrp.tax.storage.message.Message;
  5 +import com.diligrp.tax.central.message.Message;
6 6 import jakarta.annotation.Resource;
7 7 import org.springframework.web.bind.annotation.RequestBody;
8 8 import org.springframework.web.bind.annotation.RequestMapping;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/DynamicTaxPipelineMappingController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.Message;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.Message;
5 5 import com.diligrp.tax.storage.model.co.TaxPipelineMappingCO;
6 6 import com.diligrp.tax.storage.service.DynamicTaxPipelineMappingService;
7 7 import jakarta.annotation.Resource;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxPipelineBusinessConfigController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.Message;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.Message;
5 5 import com.diligrp.tax.storage.model.co.TaxPipelineBusinessCO;
6 6 import com.diligrp.tax.storage.model.co.TaxPipelineBusinessConfigCO;
7 7 import com.diligrp.tax.storage.model.co.TaxPipelineBusinessExtCO;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxPipelineController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import com.diligrp.tax.storage.anno.RebuildIndex;
5   -import com.diligrp.tax.storage.message.Message;
  5 +import com.diligrp.tax.central.message.Message;
6 6 import com.diligrp.tax.storage.model.co.TaxPipelineCO;
7 7 import com.diligrp.tax.storage.service.TaxPipelineService;
8 8 import com.diligrp.tax.storage.type.StateType;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxPipelineFieldConfigController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.Message;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.Message;
5 5 import com.diligrp.tax.storage.model.co.TaxPipelineFieldConfigCO;
6 6 import com.diligrp.tax.storage.service.TaxPipelineFieldConfigService;
7 7 import jakarta.annotation.Resource;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxPipelineFieldVerifyController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.Message;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.Message;
5 5 import com.diligrp.tax.storage.model.co.TaxPipelineFieldVerifyCO;
6 6 import com.diligrp.tax.storage.model.co.TaxPipelineFieldVerifyReturnCO;
7 7 import com.diligrp.tax.storage.service.TaxPipelineFieldVerifyService;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/TaxTenantController.java
  View file @370056a
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import com.diligrp.tax.storage.anno.RebuildIndex;
5   -import com.diligrp.tax.storage.message.Message;
  5 +import com.diligrp.tax.central.message.Message;
6 6 import com.diligrp.tax.storage.model.co.TaxTenantCO;
7 7 import com.diligrp.tax.storage.service.TaxTenantService;
8 8 import jakarta.annotation.Resource;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/TaxPipelineBusinessKeyword.java 0 → 100644
  View file @370056a
  1 +package com.diligrp.tax.storage.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import lombok.Data;
  8 +
  9 +/**
  10 + *
  11 + * @TableName tax_pipeline_business_keyword
  12 + */
  13 +@TableName(value ="tax_pipeline_business_keyword")
  14 +@Data
  15 +public class TaxPipelineBusinessKeyword {
  16 + /**
  17 + *
  18 + */
  19 + @TableId(type = IdType.AUTO)
  20 + private Integer id;
  21 +
  22 + /**
  23 + * 业务id
  24 + */
  25 + @TableField(value = "tax_pipeline_business_id")
  26 + private Long taxPipelineBusinessId;
  27 +
  28 + /**
  29 + * 单据类型
  30 + */
  31 + @TableField(value = "document_type")
  32 + private Integer documentType;
  33 +
  34 + /**
  35 + * 单据字段
  36 + */
  37 + @TableField(value = "document_field")
  38 + private String documentField;
  39 +
  40 + /**
  41 + * 单据字段取值方式（1:固定，2：可变）
  42 + */
  43 + @TableField(value = "document_value_way")
  44 + private Integer documentValueWay;
  45 +
  46 + /**
  47 + * 单据字段值的内容
  48 + */
  49 + @TableField(value = "document_value_content")
  50 + private String documentValueContent;
  51 +}
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineBusinessCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.PageQuery;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.PageQuery;
5 5 import jakarta.validation.constraints.NotEmpty;
6 6 import jakarta.validation.constraints.NotNull;
7 7 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineBusinessConfigCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineBusinessExtCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineFieldConfigCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import com.diligrp.tax.central.model.DynamicValue;
5 5 import com.diligrp.tax.central.model.RemoteParam;
6 6 import jakarta.validation.constraints.NotEmpty;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineFieldVerifyCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineFieldVerifyReturnCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
  3 +import com.diligrp.tax.central.message.Valid;
4 4 import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxPipelineMappingCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.PageQuery;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.PageQuery;
5 5 import jakarta.validation.constraints.NotEmpty;
6 6 import jakarta.validation.constraints.NotNull;
7 7 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/TaxTenantCO.java
  View file @370056a
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.storage.Valid;
4   -import com.diligrp.tax.storage.message.PageQuery;
  3 +import com.diligrp.tax.central.message.Valid;
  4 +import com.diligrp.tax.central.message.PageQuery;
5 5 import jakarta.validation.constraints.NotEmpty;
6 6 import jakarta.validation.constraints.NotNull;
7 7 import lombok.Getter;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/TaxPipelineBusinessKeywordRepository.java 0 → 100644
  View file @370056a
  1 +package com.diligrp.tax.storage.repo;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.TaxPipelineBusinessKeyword;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +/**
  8 +* @author dili
  9 +* @description 针对表【tax_pipeline_business_keyword】的数据库操作Mapper
  10 +* @createDate 2025-11-17 16:00:05
  11 +* @Entity com.diligrp.tax.storge.domain.TaxPipelineBusinessKeyword
  12 +*/
  13 +@Repository
  14 +public interface TaxPipelineBusinessKeywordRepository extends BaseMapper<TaxPipelineBusinessKeyword> {
  15 +
  16 +}
  17 +
  18 +
  19 +
  20 +
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/service/TaxPipelineBusinessKeywordService.java 0 → 100644
  View file @370056a
  1 +package com.diligrp.tax.storage.service;
  2 +
  3 +import com.diligrp.tax.storage.repo.TaxPipelineBusinessKeywordRepository;
  4 +import jakarta.annotation.Resource;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +/**
  8 + * @Author: zhangmeiyang
  9 + * @CreateTime: 2025-11-17 16:05
  10 + * @Version: todo
  11 + */
  12 +@Service
  13 +public class TaxPipelineBusinessKeywordService {
  14 +
  15 + @Resource
  16 + private TaxPipelineBusinessKeywordRepository taxPipelineBusinessKeywordRepository;
  17 +
  18 +
  19 +}
... ...