1. 合并base改包代码

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java

@@ -1,6 +1,5 @@
 package com.zt.plat.module.template.controller.admin.contract;
 
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
 import com.zt.plat.framework.business.annotation.FileUploadController;
 import com.zt.plat.framework.business.controller.AbstractFileUploadController;
@@ -20,6 +19,7 @@ import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractResp
 import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractSaveReqVO;
 import com.zt.plat.module.template.dal.dataobject.contract.DemoContractDO;
 import com.zt.plat.module.template.service.contract.DemoContractService;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/example/ExampleController.java

@@ -1,31 +1,33 @@
 package com.zt.plat.module.template.controller.admin.example;
 
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import com.zt.plat.framework.common.pojo.CommonResult;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-import com.zt.plat.module.template.controller.admin.example.vo.ExamplePageReqVO;
-import com.zt.plat.module.template.controller.admin.example.vo.ExampleRespVO;
-import com.zt.plat.module.template.controller.admin.example.vo.ExampleSaveReqVO;
+
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.zt.plat.module.template.controller.admin.example.vo.*;
 import com.zt.plat.module.template.dal.dataobject.example.ExampleDO;
 import com.zt.plat.module.template.service.example.ExampleService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.List;
-
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 模板样例")
 @RestController

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/example/vo/ExamplePageReqVO.java

@@ -1,13 +1,14 @@
 package com.zt.plat.module.template.controller.admin.example.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zt.plat.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.*;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.*;

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/example/vo/ExampleRespVO.java

@@ -1,15 +1,15 @@
 package com.zt.plat.module.template.controller.admin.example.vo;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.*;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.*;
 

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/virtualizedtable/vo/DemoVirtualizedTablePageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.template.controller.admin.virtualizedtable.vo;
 
-import com.zt.plat.framework.common.pojo.PageParam;
+import lombok.*;
+import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
+import com.zt.plat.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/dataobject/contract/DemoContractDO.java

@@ -1,11 +1,15 @@
 package com.zt.plat.module.template.dal.dataobject.contract;
 
+import lombok.*;
+import java.util.*;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
+    import java.math.BigDecimal;
+    import java.time.LocalDateTime;
+    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
 * 合同 DO
 *

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/dataobject/example/ExampleDO.java

@@ -1,7 +1,7 @@
 package com.zt.plat.module.template.dal.dataobject.example;
 
-import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.tenant.core.db.TenantBaseDO;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
 import java.math.BigDecimal;

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/dataobject/virtualizedtable/DemoVirtualizedTableDO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.template.dal.dataobject.virtualizedtable;
 
+import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
 /**
 * 虚拟表格测试 DO

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/mysql/contract/DemoContractMapper.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.template.dal.mysql.contract;
 
+import java.util.*;
+
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractPageReqVO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.template.dal.dataobject.contract.DemoContractDO;
 import org.apache.ibatis.annotations.Mapper;
+import com.zt.plat.module.template.controller.admin.contract.vo.*;
 
 /**
  * 合同 Mapper

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/mysql/example/ExampleMapper.java

@@ -1,11 +1,14 @@
 package com.zt.plat.module.template.dal.mysql.example;
 
+import java.util.*;
+
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.template.controller.admin.example.vo.ExamplePageReqVO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.template.dal.dataobject.example.ExampleDO;
 import org.apache.ibatis.annotations.Mapper;
+import com.zt.plat.module.template.controller.admin.example.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 模板样例 Mapper

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/dal/mysql/virtualizedtable/DemoVirtualizedTableMapper.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.template.dal.mysql.virtualizedtable;
 
+import java.util.*;
+
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.DemoVirtualizedTablePageReqVO;
+import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.template.dal.dataobject.virtualizedtable.DemoVirtualizedTableDO;
 import org.apache.ibatis.annotations.Mapper;
+import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.*;
 
 /**
  * 虚拟表格测试 Mapper

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/example/ExampleService.java

@@ -1,12 +1,11 @@
 package com.zt.plat.module.template.service.example;
 
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.template.controller.admin.example.vo.ExamplePageReqVO;
-import com.zt.plat.module.template.controller.admin.example.vo.ExampleSaveReqVO;
+import java.util.*;
+import jakarta.validation.*;
+import com.zt.plat.module.template.controller.admin.example.vo.*;
 import com.zt.plat.module.template.dal.dataobject.example.ExampleDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 模板样例 Service 接口

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/example/ExampleServiceImpl.java

@@ -1,20 +1,24 @@
 package com.zt.plat.module.template.service.example;
 
 import cn.hutool.core.collection.CollUtil;
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.module.template.controller.admin.example.vo.ExamplePageReqVO;
-import com.zt.plat.module.template.controller.admin.example.vo.ExampleSaveReqVO;
-import com.zt.plat.module.template.dal.dataobject.example.ExampleDO;
-import com.zt.plat.module.template.dal.mysql.example.ExampleMapper;
-import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import java.util.*;
+import com.zt.plat.module.template.controller.admin.example.vo.*;
+import com.zt.plat.module.template.dal.dataobject.example.ExampleDO;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.framework.common.util.object.BeanUtils;
+
+import com.zt.plat.module.template.dal.mysql.example.ExampleMapper;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.module.template.enums.ErrorCodeConstants.EXAMPLE_NOT_EXISTS;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
+import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
+import static com.zt.plat.module.template.enums.ErrorCodeConstants.*;
 
 /**
  * 模板样例 Service 实现类

zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/service/virtualizedtable/DemoVirtualizedTableService.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.template.service.virtualizedtable;
 
-import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.DemoVirtualizedTablePageReqVO;
-import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.DemoVirtualizedTableRespVO;
-import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.DemoVirtualizedTableSaveReqVO;
+import java.util.*;
+import jakarta.validation.*;
+import com.zt.plat.module.template.controller.admin.virtualizedtable.vo.*;
 import com.zt.plat.module.template.dal.dataobject.virtualizedtable.DemoVirtualizedTableDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 虚拟表格测试 Service 接口