From 9cb6e01753dff1e8e3c0770ce7251d4ca9400b43 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 17 Jul 2025 23:36:55 +0800 Subject: [PATCH] =?UTF-8?q?:package:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bunny/controller/GeneratorController.java | 6 +++--- .../cn/bunny/controller/SqlParserController.java | 6 +++--- .../java/cn/bunny/controller/TableController.java | 10 +++++----- .../java/cn/bunny/controller/VmsController.java | 4 ++-- .../core/provider/DatabaseMetadataProvider.java | 6 +++--- .../cn/bunny/core/provider/IMetadataProvider.java | 4 ++-- .../bunny/core/provider/SqlMetadataProvider.java | 4 ++-- .../core/template/AbstractTemplateGenerator.java | 4 ++-- .../core/template/VmsTBaseTemplateGenerator.java | 4 ++-- .../cn/bunny/exception/GeneratorCodeException.java | 2 +- .../cn/bunny/exception/GlobalExceptionHandler.java | 4 ++-- .../{domain => model}/dto/VmsArgumentDto.java | 2 +- .../{domain => model}/entity/ColumnMetaData.java | 2 +- .../entity/DatabaseInfoMetaData.java | 2 +- .../{domain => model}/entity/TableMetaData.java | 2 +- .../bunny/{domain => model}/result/PageResult.java | 2 +- .../cn/bunny/{domain => model}/result/Result.java | 2 +- .../{domain => model}/result/ResultCodeEnum.java | 2 +- .../cn/bunny/{domain => model}/vo/GeneratorVo.java | 2 +- .../cn/bunny/{domain => model}/vo/VmsPathVo.java | 2 +- .../java/cn/bunny/service/GeneratorService.java | 4 ++-- src/main/java/cn/bunny/service/TableService.java | 4 ++-- src/main/java/cn/bunny/service/VmsService.java | 2 +- .../bunny/service/impl/GeneratorServiceImpl.java | 8 ++++---- .../cn/bunny/service/impl/TableServiceImpl.java | 4 ++-- .../java/cn/bunny/service/impl/VmsServiceImpl.java | 2 +- src/main/java/cn/bunny/utils/ZipFileUtil.java | 2 +- .../vms/server/controller/controller.java.vm | 12 ++++++------ .../resources/vms/server/mapper/mapper.java.vm | 12 ++++++------ .../vms/server/mapper/mapper/resourceMapper.xml.vm | 4 ++-- .../vms/server/{domain => model}/dto/dto.java.vm | 0 .../server/{domain => model}/entity/entity.java.vm | 0 .../vms/server/{domain => model}/vo/vo.java.vm | 0 .../vms/server/service/impl/serviceImpl.java.vm | 14 +++++++------- .../resources/vms/server/service/service.java.vm | 12 ++++++------ 35 files changed, 76 insertions(+), 76 deletions(-) rename src/main/java/cn/bunny/{domain => model}/dto/VmsArgumentDto.java (97%) rename src/main/java/cn/bunny/{domain => model}/entity/ColumnMetaData.java (95%) rename src/main/java/cn/bunny/{domain => model}/entity/DatabaseInfoMetaData.java (97%) rename src/main/java/cn/bunny/{domain => model}/entity/TableMetaData.java (97%) rename src/main/java/cn/bunny/{domain => model}/result/PageResult.java (95%) rename src/main/java/cn/bunny/{domain => model}/result/Result.java (99%) rename src/main/java/cn/bunny/{domain => model}/result/ResultCodeEnum.java (99%) rename src/main/java/cn/bunny/{domain => model}/vo/GeneratorVo.java (96%) rename src/main/java/cn/bunny/{domain => model}/vo/VmsPathVo.java (96%) rename src/main/resources/vms/server/{domain => model}/dto/dto.java.vm (100%) rename src/main/resources/vms/server/{domain => model}/entity/entity.java.vm (100%) rename src/main/resources/vms/server/{domain => model}/vo/vo.java.vm (100%) diff --git a/src/main/java/cn/bunny/controller/GeneratorController.java b/src/main/java/cn/bunny/controller/GeneratorController.java index 83075ec..001af4c 100644 --- a/src/main/java/cn/bunny/controller/GeneratorController.java +++ b/src/main/java/cn/bunny/controller/GeneratorController.java @@ -1,8 +1,8 @@ package cn.bunny.controller; -import cn.bunny.domain.dto.VmsArgumentDto; -import cn.bunny.domain.result.Result; -import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.model.dto.VmsArgumentDto; +import cn.bunny.model.result.Result; +import cn.bunny.model.vo.GeneratorVo; import cn.bunny.service.GeneratorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/cn/bunny/controller/SqlParserController.java b/src/main/java/cn/bunny/controller/SqlParserController.java index bf59be5..2c0bfeb 100644 --- a/src/main/java/cn/bunny/controller/SqlParserController.java +++ b/src/main/java/cn/bunny/controller/SqlParserController.java @@ -1,9 +1,9 @@ package cn.bunny.controller; import cn.bunny.core.provider.SqlMetadataProvider; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.TableMetaData; -import cn.bunny.domain.result.Result; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.TableMetaData; +import cn.bunny.model.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cn/bunny/controller/TableController.java b/src/main/java/cn/bunny/controller/TableController.java index 80a8416..8c2f115 100644 --- a/src/main/java/cn/bunny/controller/TableController.java +++ b/src/main/java/cn/bunny/controller/TableController.java @@ -1,11 +1,11 @@ package cn.bunny.controller; import cn.bunny.core.provider.DatabaseMetadataProvider; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.DatabaseInfoMetaData; -import cn.bunny.domain.entity.TableMetaData; -import cn.bunny.domain.result.Result; -import cn.bunny.domain.result.ResultCodeEnum; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.DatabaseInfoMetaData; +import cn.bunny.model.entity.TableMetaData; +import cn.bunny.model.result.Result; +import cn.bunny.model.result.ResultCodeEnum; import cn.bunny.service.TableService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/cn/bunny/controller/VmsController.java b/src/main/java/cn/bunny/controller/VmsController.java index f60f77a..5a04c8b 100644 --- a/src/main/java/cn/bunny/controller/VmsController.java +++ b/src/main/java/cn/bunny/controller/VmsController.java @@ -1,7 +1,7 @@ package cn.bunny.controller; -import cn.bunny.domain.result.Result; -import cn.bunny.domain.vo.VmsPathVo; +import cn.bunny.model.result.Result; +import cn.bunny.model.vo.VmsPathVo; import cn.bunny.service.VmsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/cn/bunny/core/provider/DatabaseMetadataProvider.java b/src/main/java/cn/bunny/core/provider/DatabaseMetadataProvider.java index 0ff067c..ab3e26d 100644 --- a/src/main/java/cn/bunny/core/provider/DatabaseMetadataProvider.java +++ b/src/main/java/cn/bunny/core/provider/DatabaseMetadataProvider.java @@ -1,11 +1,11 @@ package cn.bunny.core.provider; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.DatabaseInfoMetaData; -import cn.bunny.domain.entity.TableMetaData; import cn.bunny.exception.GeneratorCodeException; import cn.bunny.exception.MetadataNotFoundException; import cn.bunny.exception.MetadataProviderException; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.DatabaseInfoMetaData; +import cn.bunny.model.entity.TableMetaData; import cn.bunny.utils.MysqlTypeConvertUtil; import com.zaxxer.hikari.HikariDataSource; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cn/bunny/core/provider/IMetadataProvider.java b/src/main/java/cn/bunny/core/provider/IMetadataProvider.java index bf1fb80..7190de6 100644 --- a/src/main/java/cn/bunny/core/provider/IMetadataProvider.java +++ b/src/main/java/cn/bunny/core/provider/IMetadataProvider.java @@ -1,7 +1,7 @@ package cn.bunny.core.provider; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.TableMetaData; import java.util.List; diff --git a/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java b/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java index 3adaf0c..e541187 100644 --- a/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java +++ b/src/main/java/cn/bunny/core/provider/SqlMetadataProvider.java @@ -1,10 +1,10 @@ package cn.bunny.core.provider; import cn.bunny.core.dialect.DatabaseDialect; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.TableMetaData; import cn.bunny.exception.GeneratorCodeException; import cn.bunny.exception.SqlParseException; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.TableMetaData; import cn.bunny.utils.MysqlTypeConvertUtil; import lombok.RequiredArgsConstructor; import net.sf.jsqlparser.JSQLParserException; diff --git a/src/main/java/cn/bunny/core/template/AbstractTemplateGenerator.java b/src/main/java/cn/bunny/core/template/AbstractTemplateGenerator.java index 3661670..24058e1 100644 --- a/src/main/java/cn/bunny/core/template/AbstractTemplateGenerator.java +++ b/src/main/java/cn/bunny/core/template/AbstractTemplateGenerator.java @@ -1,7 +1,7 @@ package cn.bunny.core.template; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.TableMetaData; import org.apache.velocity.VelocityContext; import java.io.StringWriter; diff --git a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java index 1e69879..b55ca56 100644 --- a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java +++ b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java @@ -1,7 +1,7 @@ package cn.bunny.core.template; -import cn.bunny.domain.dto.VmsArgumentDto; -import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.model.dto.VmsArgumentDto; +import cn.bunny.model.entity.TableMetaData; import cn.bunny.utils.MysqlTypeConvertUtil; import com.google.common.base.CaseFormat; import org.apache.velocity.Template; diff --git a/src/main/java/cn/bunny/exception/GeneratorCodeException.java b/src/main/java/cn/bunny/exception/GeneratorCodeException.java index b24d9c6..d590bbb 100644 --- a/src/main/java/cn/bunny/exception/GeneratorCodeException.java +++ b/src/main/java/cn/bunny/exception/GeneratorCodeException.java @@ -1,6 +1,6 @@ package cn.bunny.exception; -import cn.bunny.domain.result.ResultCodeEnum; +import cn.bunny.model.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java b/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java index 4180e0e..acca605 100644 --- a/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java +++ b/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package cn.bunny.exception; -import cn.bunny.domain.result.Result; -import cn.bunny.domain.result.ResultCodeEnum; +import cn.bunny.model.result.Result; +import cn.bunny.model.result.ResultCodeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.util.StringUtils; diff --git a/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java b/src/main/java/cn/bunny/model/dto/VmsArgumentDto.java similarity index 97% rename from src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java rename to src/main/java/cn/bunny/model/dto/VmsArgumentDto.java index f122639..26fa39a 100644 --- a/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java +++ b/src/main/java/cn/bunny/model/dto/VmsArgumentDto.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.dto; +package cn.bunny.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/cn/bunny/domain/entity/ColumnMetaData.java b/src/main/java/cn/bunny/model/entity/ColumnMetaData.java similarity index 95% rename from src/main/java/cn/bunny/domain/entity/ColumnMetaData.java rename to src/main/java/cn/bunny/model/entity/ColumnMetaData.java index bab09c2..8d04636 100644 --- a/src/main/java/cn/bunny/domain/entity/ColumnMetaData.java +++ b/src/main/java/cn/bunny/model/entity/ColumnMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.entity; +package cn.bunny.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java b/src/main/java/cn/bunny/model/entity/DatabaseInfoMetaData.java similarity index 97% rename from src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java rename to src/main/java/cn/bunny/model/entity/DatabaseInfoMetaData.java index 33080e9..594f1b5 100644 --- a/src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java +++ b/src/main/java/cn/bunny/model/entity/DatabaseInfoMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.entity; +package cn.bunny.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/bunny/domain/entity/TableMetaData.java b/src/main/java/cn/bunny/model/entity/TableMetaData.java similarity index 97% rename from src/main/java/cn/bunny/domain/entity/TableMetaData.java rename to src/main/java/cn/bunny/model/entity/TableMetaData.java index 4683f10..d2379db 100644 --- a/src/main/java/cn/bunny/domain/entity/TableMetaData.java +++ b/src/main/java/cn/bunny/model/entity/TableMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.entity; +package cn.bunny.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/bunny/domain/result/PageResult.java b/src/main/java/cn/bunny/model/result/PageResult.java similarity index 95% rename from src/main/java/cn/bunny/domain/result/PageResult.java rename to src/main/java/cn/bunny/model/result/PageResult.java index f717ce4..b2bb7f8 100644 --- a/src/main/java/cn/bunny/domain/result/PageResult.java +++ b/src/main/java/cn/bunny/model/result/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.result; +package cn.bunny.model.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/bunny/domain/result/Result.java b/src/main/java/cn/bunny/model/result/Result.java similarity index 99% rename from src/main/java/cn/bunny/domain/result/Result.java rename to src/main/java/cn/bunny/model/result/Result.java index 97cc870..3428696 100644 --- a/src/main/java/cn/bunny/domain/result/Result.java +++ b/src/main/java/cn/bunny/model/result/Result.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.result; +package cn.bunny.model.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java b/src/main/java/cn/bunny/model/result/ResultCodeEnum.java similarity index 99% rename from src/main/java/cn/bunny/domain/result/ResultCodeEnum.java rename to src/main/java/cn/bunny/model/result/ResultCodeEnum.java index 72e92cc..3416863 100644 --- a/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java +++ b/src/main/java/cn/bunny/model/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.result; +package cn.bunny.model.result; import lombok.Getter; diff --git a/src/main/java/cn/bunny/domain/vo/GeneratorVo.java b/src/main/java/cn/bunny/model/vo/GeneratorVo.java similarity index 96% rename from src/main/java/cn/bunny/domain/vo/GeneratorVo.java rename to src/main/java/cn/bunny/model/vo/GeneratorVo.java index ab835c9..f5d5e12 100644 --- a/src/main/java/cn/bunny/domain/vo/GeneratorVo.java +++ b/src/main/java/cn/bunny/model/vo/GeneratorVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.vo; +package cn.bunny.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/bunny/domain/vo/VmsPathVo.java b/src/main/java/cn/bunny/model/vo/VmsPathVo.java similarity index 96% rename from src/main/java/cn/bunny/domain/vo/VmsPathVo.java rename to src/main/java/cn/bunny/model/vo/VmsPathVo.java index c4a4b15..e0cd8fd 100644 --- a/src/main/java/cn/bunny/domain/vo/VmsPathVo.java +++ b/src/main/java/cn/bunny/model/vo/VmsPathVo.java @@ -1,4 +1,4 @@ -package cn.bunny.domain.vo; +package cn.bunny.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/bunny/service/GeneratorService.java b/src/main/java/cn/bunny/service/GeneratorService.java index 95a162f..6017b57 100644 --- a/src/main/java/cn/bunny/service/GeneratorService.java +++ b/src/main/java/cn/bunny/service/GeneratorService.java @@ -1,7 +1,7 @@ package cn.bunny.service; -import cn.bunny.domain.dto.VmsArgumentDto; -import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.model.dto.VmsArgumentDto; +import cn.bunny.model.vo.GeneratorVo; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/cn/bunny/service/TableService.java b/src/main/java/cn/bunny/service/TableService.java index f50ca1a..780461e 100644 --- a/src/main/java/cn/bunny/service/TableService.java +++ b/src/main/java/cn/bunny/service/TableService.java @@ -1,6 +1,6 @@ package cn.bunny.service; -import cn.bunny.domain.entity.DatabaseInfoMetaData; +import cn.bunny.model.entity.DatabaseInfoMetaData; public interface TableService { @@ -10,5 +10,5 @@ public interface TableService { * @return 当前连接的数据库信息属性 */ DatabaseInfoMetaData databaseInfoMetaData(); - + } diff --git a/src/main/java/cn/bunny/service/VmsService.java b/src/main/java/cn/bunny/service/VmsService.java index 545231c..7a80f81 100644 --- a/src/main/java/cn/bunny/service/VmsService.java +++ b/src/main/java/cn/bunny/service/VmsService.java @@ -1,6 +1,6 @@ package cn.bunny.service; -import cn.bunny.domain.vo.VmsPathVo; +import cn.bunny.model.vo.VmsPathVo; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/bunny/service/impl/GeneratorServiceImpl.java b/src/main/java/cn/bunny/service/impl/GeneratorServiceImpl.java index b1ae57b..087e120 100644 --- a/src/main/java/cn/bunny/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/cn/bunny/service/impl/GeneratorServiceImpl.java @@ -2,10 +2,10 @@ package cn.bunny.service.impl; import cn.bunny.core.provider.IMetadataProvider; import cn.bunny.core.template.VmsTBaseTemplateGenerator; -import cn.bunny.domain.dto.VmsArgumentDto; -import cn.bunny.domain.entity.ColumnMetaData; -import cn.bunny.domain.entity.TableMetaData; -import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.model.dto.VmsArgumentDto; +import cn.bunny.model.entity.ColumnMetaData; +import cn.bunny.model.entity.TableMetaData; +import cn.bunny.model.vo.GeneratorVo; import cn.bunny.service.GeneratorService; import cn.bunny.service.helper.VmsGeneratorPathHelper; import cn.bunny.utils.ZipFileUtil; diff --git a/src/main/java/cn/bunny/service/impl/TableServiceImpl.java b/src/main/java/cn/bunny/service/impl/TableServiceImpl.java index 229a03c..f1ad0b8 100644 --- a/src/main/java/cn/bunny/service/impl/TableServiceImpl.java +++ b/src/main/java/cn/bunny/service/impl/TableServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.service.impl; import cn.bunny.core.provider.DatabaseMetadataProvider; -import cn.bunny.domain.entity.DatabaseInfoMetaData; -import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.model.entity.DatabaseInfoMetaData; +import cn.bunny.model.entity.TableMetaData; import cn.bunny.service.TableService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java b/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java index de77d9f..1c75f9d 100644 --- a/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java +++ b/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.service.impl; -import cn.bunny.domain.vo.VmsPathVo; +import cn.bunny.model.vo.VmsPathVo; import cn.bunny.service.VmsService; import cn.bunny.utils.ResourceFileUtil; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cn/bunny/utils/ZipFileUtil.java b/src/main/java/cn/bunny/utils/ZipFileUtil.java index dd622ca..74fa858 100644 --- a/src/main/java/cn/bunny/utils/ZipFileUtil.java +++ b/src/main/java/cn/bunny/utils/ZipFileUtil.java @@ -1,6 +1,6 @@ package cn.bunny.utils; -import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.model.vo.GeneratorVo; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/resources/vms/server/controller/controller.java.vm b/src/main/resources/vms/server/controller/controller.java.vm index cd8d4b4..5291e8e 100644 --- a/src/main/resources/vms/server/controller/controller.java.vm +++ b/src/main/resources/vms/server/controller/controller.java.vm @@ -1,8 +1,8 @@ package ${package}.controller; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import ${package}.service.${classUppercaseName}Service; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.vo.result.PageResult; +import ${package}.model.vo.result.Result; +import ${package}.model.vo.result.ResultCodeEnum; import java.util.List; /** diff --git a/src/main/resources/vms/server/mapper/mapper.java.vm b/src/main/resources/vms/server/mapper/mapper.java.vm index 0b3f0e5..a8a9416 100644 --- a/src/main/resources/vms/server/mapper/mapper.java.vm +++ b/src/main/resources/vms/server/mapper/mapper.java.vm @@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.vo.result.PageResult; +import ${package}.model.vo.result.Result; +import ${package}.model.vo.result.ResultCodeEnum; import java.util.List; /** diff --git a/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm b/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm index ba1e6ed..9814851 100644 --- a/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm +++ b/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm @@ -3,7 +3,7 @@ - + #foreach($field in ${columnInfoList}) #end @@ -15,7 +15,7 @@ - select base.*, create_user.username as create_username, diff --git a/src/main/resources/vms/server/domain/dto/dto.java.vm b/src/main/resources/vms/server/model/dto/dto.java.vm similarity index 100% rename from src/main/resources/vms/server/domain/dto/dto.java.vm rename to src/main/resources/vms/server/model/dto/dto.java.vm diff --git a/src/main/resources/vms/server/domain/entity/entity.java.vm b/src/main/resources/vms/server/model/entity/entity.java.vm similarity index 100% rename from src/main/resources/vms/server/domain/entity/entity.java.vm rename to src/main/resources/vms/server/model/entity/entity.java.vm diff --git a/src/main/resources/vms/server/domain/vo/vo.java.vm b/src/main/resources/vms/server/model/vo/vo.java.vm similarity index 100% rename from src/main/resources/vms/server/domain/vo/vo.java.vm rename to src/main/resources/vms/server/model/vo/vo.java.vm diff --git a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm index e3af511..38b5f7e 100644 --- a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm +++ b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm @@ -9,12 +9,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${package}.service.${classUppercaseName}Service; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; +import ${package}.model.vo.result.PageResult; +import ${package}.model.vo.result.Result; +import ${package}.model.vo.result.ResultCodeEnum; import java.util.List; /** @@ -30,7 +30,7 @@ import java.util.List; public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUppercaseName}Mapper, ${classUppercaseName}Entity> implements ${classUppercaseName}Service { /** - * * ${comment} 服务实现类 + * ${comment} 服务实现类 * * @param pageParams ${comment}分页查询page对象 * @param dto ${comment}分页查询对象 diff --git a/src/main/resources/vms/server/service/service.java.vm b/src/main/resources/vms/server/service/service.java.vm index 875ca86..2697672 100644 --- a/src/main/resources/vms/server/service/service.java.vm +++ b/src/main/resources/vms/server/service/service.java.vm @@ -3,12 +3,12 @@ package ${package}.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import ${package}.domain.dto.${classUppercaseName}Dto; -import ${package}.domain.entity.${classUppercaseName}Entity; -import ${package}.domain.vo.${classUppercaseName}Vo; -import ${package}.domain.vo.result.PageResult; -import ${package}.domain.vo.result.Result; -import ${package}.domain.vo.result.ResultCodeEnum; +import ${package}.model.dto.${classUppercaseName}Dto; +import ${package}.model.entity.${classUppercaseName}Entity; +import ${package}.model.vo.${classUppercaseName}Vo; +import ${package}.model.vo.result.PageResult; +import ${package}.model.vo.result.Result; +import ${package}.model.vo.result.ResultCodeEnum; import java.util.List; /**