Commit 562b7972b935f317e1f6f0364198420bb1c2cfc8

Authored by zhangmeiyang
1 parent 80c081ac

refactor(core): 清理无用导入并优化代码结构

- 移除了多个类中未使用的导入语句
- 调整了部分文件中的 import 顺序以符合规范
- 删除了冗余的 BigDecimal 和其他未引用的类型导入
- 优化了部分模块的依赖引入方式
- 统一了部分包内类的导入风格
- 移除了废弃或重复的 ControllerAdvice 注解
- 精简了 KingDeeHelper 中不必要的实体类导入
- 更新了日志保留时间从 30 天延长至 180 天
- 调整了部分 domain 类的 Lombok 注解使用方式
- 优化了 tax-boot 模块中模型类的字段校验注解顺序
Showing 39 changed files with 39 additions and 51 deletions
tax-adopt/src/main/java/com/diligrp/tax/adopt/model/ReceiveMessageCO.java
1 1 package com.diligrp.tax.adopt.model;
2 2  
3   -import com.diligrp.tax.central.type.SystemType;
4 3 import lombok.Data;
5 4  
6 5 import java.util.Map;
... ...
tax-boot/src/main/java/com/diligrp/tax/boot/service/TaxReceiveService.java
... ... @@ -5,8 +5,8 @@ import com.diligrp.tax.central.domain.MessageContext;
5 5 import com.diligrp.tax.central.exception.TaxAgentServiceException;
6 6 import com.diligrp.tax.central.model.PipelineDO;
7 7 import com.diligrp.tax.central.model.PipelineMappingCreateDO;
8   -import com.diligrp.tax.central.model.PipelineMappingErrorDO;
9 8 import com.diligrp.tax.central.model.PipelineMappingDO;
  9 +import com.diligrp.tax.central.model.PipelineMappingErrorDO;
10 10 import com.diligrp.tax.central.service.IMappingErrorService;
11 11 import com.diligrp.tax.central.service.IPipelineMappingService;
12 12 import com.diligrp.tax.central.service.ITenantService;
... ...
tax-boot/src/main/resources/logback-spring.xml
... ... @@ -20,7 +20,7 @@
20 20 <!--日志文件输出的文件名 -->
21 21 <fileNamePattern>${LOG_HOME}/%d{yyyy-MM-dd}/${LOG_NAME}_%i.log.zip</fileNamePattern>
22 22 <!--日志文件保留天数(FileNamePattern中的%d 格式有关,如果yyyy-MM-dd 则是天数) -->
23   - <maxHistory>30</maxHistory>
  23 + <maxHistory>180</maxHistory>
24 24 <!--日志文件最大的大小 -->
25 25 <maxFileSize>10MB</maxFileSize>
26 26 </rollingPolicy>
... ...
tax-central/src/main/java/com/diligrp/tax/central/config/GlobalExceptionHandler.java
1 1 package com.diligrp.tax.central.config;
2 2  
3 3 import com.diligrp.tax.central.exception.TaxAgentServiceException;
4   -import com.diligrp.tax.central.type.TaxSystemType;
5 4 import com.diligrp.tax.central.message.Message;
  5 +import com.diligrp.tax.central.type.TaxSystemType;
6 6 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
7 7 import jakarta.validation.ConstraintViolation;
8 8 import jakarta.validation.ConstraintViolationException;
... ... @@ -14,7 +14,6 @@ import org.springframework.validation.BindingResult;
14 14 import org.springframework.validation.ObjectError;
15 15 import org.springframework.web.bind.MethodArgumentNotValidException;
16 16 import org.springframework.web.bind.MissingServletRequestParameterException;
17   -import org.springframework.web.bind.annotation.ControllerAdvice;
18 17 import org.springframework.web.bind.annotation.ExceptionHandler;
19 18 import org.springframework.web.bind.annotation.RestControllerAdvice;
20 19  
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/CustomerCreateOrgConverter.java
... ... @@ -2,7 +2,6 @@ package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.IConverter;
4 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.FCreateOrgId;
5   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FGroup;
6 5 import org.springframework.stereotype.Component;
7 6  
8 7 import java.util.Objects;
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/CustomerCurrencyConverter.java
1 1 package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.IConverter;
4   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FContactId;
5 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.FTRADINGCURRID;
6 5 import org.springframework.stereotype.Component;
7 6  
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/CustomerItemConverter.java
1 1 package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.ISubConverter;
4   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FRECEIVEBILLENTRY;
5 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.FT_BD_CUSTLOCATION;
6 5 import com.diligrp.tax.central.utils.MappingUtils;
7 6 import lombok.extern.slf4j.Slf4j;
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/CustomerProvincialConverter.java
1 1 package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.IConverter;
4   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FCOUNTRY;
5 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.FPROVINCIAL;
6 5 import org.springframework.stereotype.Component;
7 6  
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/CustomerUseOrgConverter.java
1 1 package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.IConverter;
4   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FCreateOrgId;
5 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.FUseOrgId;
6 5 import org.springframework.stereotype.Component;
7 6  
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/ReceiptItemConverter.java
... ... @@ -6,7 +6,9 @@ import com.diligrp.tax.central.utils.MappingUtils;
6 6 import lombok.extern.slf4j.Slf4j;
7 7 import org.springframework.stereotype.Component;
8 8  
9   -import java.util.*;
  9 +import java.util.Collections;
  10 +import java.util.List;
  11 +import java.util.Objects;
10 12  
11 13 /**
12 14 * @Author: zhangmeiyang
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/ReceivableReceiveDeptConverter.java
1 1 package com.diligrp.tax.central.converter.impl;
2 2  
3 3 import com.diligrp.tax.central.converter.IConverter;
4   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FSettleTypeID;
5 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.F_PZCW_Base_qtr1;
6 5 import org.springframework.stereotype.Component;
7 6  
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/document/kingdee/bill/item/ReceivableItem.java
... ... @@ -7,8 +7,6 @@ import com.diligrp.tax.central.converter.impl.StringConverter;
7 7 import lombok.Getter;
8 8 import lombok.Setter;
9 9  
10   -import java.math.BigDecimal;
11   -
12 10 /**
13 11 * @Author: zhangmeiyang
14 12 * @CreateTime: 2025-10-29 16:06
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FRECEIVEBILLENTRY.java
... ... @@ -2,8 +2,6 @@ package com.diligrp.tax.central.domain.mapping.kingdee.base;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonProperty;
4 4  
5   -import java.math.BigDecimal;
6   -
7 5 /**
8 6 * @Author: zhangmeiyang
9 7 * @CreateTime: 2024-11-25 10:10
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/FREFUNDBILLENTRY.java
... ... @@ -3,7 +3,6 @@ package com.diligrp.tax.central.domain.mapping.kingdee.base;
3 3 import com.fasterxml.jackson.annotation.JsonProperty;
4 4  
5 5 import java.io.Serializable;
6   -import java.math.BigDecimal;
7 6  
8 7 /**
9 8 * @Author: zhangmeiyang
... ...
tax-central/src/main/java/com/diligrp/tax/central/queue/TaxAutoPush.java
1 1 package com.diligrp.tax.central.queue;
2 2  
3   -import org.springframework.amqp.core.*;
  3 +import org.springframework.amqp.core.Binding;
  4 +import org.springframework.amqp.core.BindingBuilder;
  5 +import org.springframework.amqp.core.DirectExchange;
  6 +import org.springframework.amqp.core.Queue;
4 7 import org.springframework.beans.factory.annotation.Qualifier;
5 8 import org.springframework.context.annotation.Bean;
6 9 import org.springframework.context.annotation.Configuration;
... ...
tax-map/src/main/java/com/diligrp/tax/mapping/demarcate/kingdee/ReceiptTransformer.java
... ... @@ -3,17 +3,13 @@ package com.diligrp.tax.mapping.demarcate.kingdee;
3 3 import com.diligrp.tax.central.domain.BaseDocument;
4 4 import com.diligrp.tax.central.domain.document.kingdee.bill.ReceiptBill;
5 5 import com.diligrp.tax.central.domain.mapping.kingdee.ReceiptMapping;
6   -import com.diligrp.tax.central.domain.mapping.kingdee.base.FRECEIVEBILLENTRY;
7 6 import com.diligrp.tax.central.model.PipelineDO;
8 7 import com.diligrp.tax.central.type.DocumentType;
9 8 import com.diligrp.tax.central.utils.MappingUtils;
10 9 import com.diligrp.tax.mapping.demarcate.Transformer;
11 10 import org.springframework.stereotype.Component;
12 11  
13   -import java.math.BigDecimal;
14   -import java.text.MessageFormat;
15 12 import java.util.List;
16   -import java.util.Optional;
17 13  
18 14  
19 15 /**
... ...
tax-map/src/main/java/com/diligrp/tax/mapping/demarcate/kingdee/RefundTransformer.java
... ... @@ -10,7 +10,6 @@ import com.diligrp.tax.mapping.demarcate.Transformer;
10 10 import org.springframework.stereotype.Component;
11 11  
12 12 import java.util.List;
13   -import java.util.Optional;
14 13  
15 14  
16 15 /**
... ...
tax-map/src/main/java/com/diligrp/tax/mapping/process/kingdee/MappingProcessor.java
1 1 package com.diligrp.tax.mapping.process.kingdee;
2 2  
3   -import com.diligrp.tax.central.domain.MessageContext;
4 3 import com.diligrp.tax.central.domain.BaseMapping;
  4 +import com.diligrp.tax.central.domain.MessageContext;
5 5 import com.diligrp.tax.central.process.AbstractProcessor;
6 6 import com.diligrp.tax.central.utils.JsonUtils;
7 7 import com.diligrp.tax.mapping.context.MappingContext;
... ...
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/ReceiptSender.java
... ... @@ -6,19 +6,14 @@ import com.diligrp.tax.central.domain.proxy.kingdee.ReceiptProxy;
6 6 import com.diligrp.tax.central.exception.TaxAgentServiceException;
7 7 import com.diligrp.tax.central.type.DocumentType;
8 8 import com.diligrp.tax.central.type.TaxSystemType;
9   -import com.diligrp.tax.central.utils.JsonUtils;
10 9 import com.diligrp.tax.proxy.demarcate.Sender;
11 10 import com.diligrp.tax.proxy.helper.KingDeeHelper;
12   -import com.fasterxml.jackson.core.type.TypeReference;
13 11 import com.kingdee.bos.webapi.entity.IdentifyInfo;
14 12 import com.kingdee.bos.webapi.entity.RepoRet;
15 13 import com.kingdee.bos.webapi.entity.SuccessEntity;
16   -import com.kingdee.bos.webapi.sdk.K3CloudApi;
17 14 import org.springframework.stereotype.Component;
18 15  
19 16 import java.util.ArrayList;
20   -import java.util.List;
21   -import java.util.Map;
22 17  
23 18 /**
24 19 * @Author: zhangmeiyang
... ...
tax-proxy/src/main/java/com/diligrp/tax/proxy/helper/KingDeeHelper.java
... ... @@ -8,7 +8,10 @@ import com.diligrp.tax.proxy.message.KingDeeQuery;
8 8 import com.diligrp.tax.proxy.message.KingDeeSubmit;
9 9 import com.fasterxml.jackson.core.type.TypeReference;
10 10 import com.google.gson.Gson;
11   -import com.kingdee.bos.webapi.entity.*;
  11 +import com.kingdee.bos.webapi.entity.IdentifyInfo;
  12 +import com.kingdee.bos.webapi.entity.OperateParam;
  13 +import com.kingdee.bos.webapi.entity.RepoError;
  14 +import com.kingdee.bos.webapi.entity.RepoRet;
12 15 import com.kingdee.bos.webapi.sdk.K3CloudApi;
13 16 import lombok.extern.slf4j.Slf4j;
14 17  
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/PipelineApi.java
1 1 package com.diligrp.tax.storage.controller;
2 2  
  3 +import com.diligrp.tax.central.message.Message;
3 4 import com.diligrp.tax.central.message.Valid;
4 5 import com.diligrp.tax.storage.anno.RebuildIndex;
5   -import com.diligrp.tax.central.message.Message;
6 6 import com.diligrp.tax.storage.model.co.PipelineCO;
7 7 import com.diligrp.tax.storage.service.PipelineService;
8 8 import com.diligrp.tax.storage.type.StateType;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/PipelineBusinessApi.java
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.Message;
5   -import com.diligrp.tax.storage.model.co.*;
  4 +import com.diligrp.tax.central.message.Valid;
  5 +import com.diligrp.tax.storage.model.co.PipelineBusinessCO;
  6 +import com.diligrp.tax.storage.model.co.PipelineBusinessKeywordCO;
6 7 import com.diligrp.tax.storage.service.PipelineBusinessService;
7 8 import jakarta.annotation.Resource;
8 9 import org.springframework.validation.annotation.Validated;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/PipelineDocFieldApi.java
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.Message;
  4 +import com.diligrp.tax.central.message.Valid;
5 5 import com.diligrp.tax.storage.model.co.PipelineDocFieldTypeCO;
6 6 import com.diligrp.tax.storage.service.PipelineDocFieldTypeService;
7 7 import jakarta.annotation.Resource;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/PipelineDocValidApi.java
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.Message;
  4 +import com.diligrp.tax.central.message.Valid;
5 5 import com.diligrp.tax.storage.model.co.PipelineDocValidCO;
6 6 import com.diligrp.tax.storage.model.co.PipelineDocValidReturnCO;
7 7 import com.diligrp.tax.storage.service.PipelineDocValidService;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/controller/PipelineMappingApi.java
1 1 package com.diligrp.tax.storage.controller;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.Message;
  4 +import com.diligrp.tax.central.message.Valid;
5 5 import com.diligrp.tax.storage.model.co.PipelineMappingCO;
6 6 import com.diligrp.tax.storage.service.PipelineMappingService;
7 7 import jakarta.annotation.Resource;
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/PipelineBusiness.java
... ... @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import lombok.Data;
8 7 import lombok.Getter;
9 8 import lombok.Setter;
10 9  
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/PipelineDocFieldType.java
... ... @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import java.time.LocalDateTime;
8 7 import lombok.Data;
9 8  
  9 +import java.time.LocalDateTime;
  10 +
10 11 /**
11 12 * 账套字段配置表
12 13 *
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/PipelineDocFieldTypeDynamic.java
... ... @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import java.time.LocalDateTime;
8 7 import lombok.Data;
9 8  
  9 +import java.time.LocalDateTime;
  10 +
10 11 /**
11 12 * 账套动态字段配置表
12 13 *
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/PipelineDocValid.java
... ... @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import java.time.LocalDateTime;
8 7 import lombok.Data;
9 8  
  9 +import java.time.LocalDateTime;
  10 +
10 11 /**
11 12 * 账套字段验证重复表
12 13 *
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/domain/PipelineDocValidReturn.java
... ... @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import java.time.LocalDateTime;
8 7 import lombok.Data;
9 8  
  9 +import java.time.LocalDateTime;
  10 +
10 11 /**
11 12 * 账套字段验证重复表
12 13 *
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/PipelineBusinessCO.java
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.PageQuery;
  4 +import com.diligrp.tax.central.message.Valid;
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/PipelineMappingCO.java
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.PageQuery;
  4 +import com.diligrp.tax.central.message.Valid;
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/TenantCO.java
1 1 package com.diligrp.tax.storage.model.co;
2 2  
3   -import com.diligrp.tax.central.message.Valid;
4 3 import com.diligrp.tax.central.message.PageQuery;
  4 +import com.diligrp.tax.central.message.Valid;
5 5 import jakarta.validation.constraints.NotEmpty;
6   -import jakarta.validation.constraints.NotNull;
7 6 import lombok.Getter;
8 7 import lombok.Setter;
9 8  
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineBusinessRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineBusiness;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineBusiness;
5 5  
6 6 /**
7 7 * @author dili
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineDocFieldTypeDynamicRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineDocFieldTypeDynamic;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineDocFieldTypeDynamic;
5 5 import org.springframework.stereotype.Repository;
6 6  
7 7 /**
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineDocFieldTypeFixedRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineDocFieldTypeFixed;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineDocFieldTypeFixed;
5 5 import org.springframework.stereotype.Repository;
6 6  
7 7 /**
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineDocFieldTypeRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineDocFieldType;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineDocFieldType;
5 5  
6 6 /**
7 7 * @author dili
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineDocValidRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineDocValid;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineDocValid;
5 5 import org.springframework.stereotype.Repository;
6 6  
7 7 /**
... ...
tax-storage/src/main/java/com/diligrp/tax/storage/repo/PipelineDocValidReturnRepository.java
1 1 package com.diligrp.tax.storage.repo;
2 2  
3   -import com.diligrp.tax.storage.domain.PipelineDocValidReturn;
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.diligrp.tax.storage.domain.PipelineDocValidReturn;
5 5 import org.springframework.stereotype.Repository;
6 6  
7 7 /**
... ...