diff --git a/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java index a7407459..29e06015 100644 --- a/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java +++ b/src/main/java/com/youlai/boot/platform/generator/controller/GeneratorController.java @@ -7,9 +7,9 @@ import com.youlai.boot.config.property.GeneratorProperties; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.platform.generator.service.GeneratorService; import com.youlai.boot.platform.generator.model.form.GenConfigForm; -import com.youlai.boot.system.model.query.TablePageQuery; -import com.youlai.boot.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.platform.generator.model.query.TablePageQuery; +import com.youlai.boot.platform.generator.model.vo.GeneratorPreviewVO; +import com.youlai.boot.platform.generator.model.vo.TablePageVO; import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/boot/platform/generator/converter/GenConfigConverter.java similarity index 96% rename from src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java rename to src/main/java/com/youlai/boot/platform/generator/converter/GenConfigConverter.java index e09b2cf8..7692cd09 100644 --- a/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/boot/platform/generator/converter/GenConfigConverter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.converter; +package com.youlai.boot.platform.generator.converter; import com.youlai.boot.platform.generator.model.entity.GenConfig; import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; diff --git a/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java index a1968f8f..7d5d0fa4 100644 --- a/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/platform/generator/mapper/DatabaseMapper.java @@ -2,18 +2,17 @@ package com.youlai.boot.platform.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.system.model.bo.ColumnMetaData; -import com.youlai.boot.system.model.bo.TableMetaData; -import com.youlai.boot.system.model.entity.Dept; -import com.youlai.boot.system.model.query.TablePageQuery; -import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.platform.generator.model.bo.ColumnMetaData; +import com.youlai.boot.platform.generator.model.bo.TableMetaData; +import com.youlai.boot.platform.generator.model.query.TablePageQuery; +import com.youlai.boot.platform.generator.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface DatabaseMapper extends BaseMapper { +public interface DatabaseMapper extends BaseMapper { Page getTablePage(Page page, TablePageQuery queryParams); diff --git a/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/platform/generator/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/platform/generator/model/bo/ColumnMetaData.java index b956a4d9..18a57316 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.model.bo; +package com.youlai.boot.platform.generator.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/platform/generator/model/bo/TableMetaData.java similarity index 90% rename from src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/platform/generator/model/bo/TableMetaData.java index b011df8e..53eeaef9 100644 --- a/src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.model.bo; +package com.youlai.boot.platform.generator.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/platform/generator/model/query/TablePageQuery.java similarity index 91% rename from src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/platform/generator/model/query/TablePageQuery.java index c841f9f2..b141f544 100644 --- a/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/query/TablePageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.model.query; +package com.youlai.boot.platform.generator.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; import com.youlai.boot.common.base.BasePageQuery; diff --git a/src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java b/src/main/java/com/youlai/boot/platform/generator/model/vo/GeneratorPreviewVO.java similarity index 88% rename from src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java rename to src/main/java/com/youlai/boot/platform/generator/model/vo/GeneratorPreviewVO.java index 1fd62aab..e4a7dc14 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/vo/GeneratorPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.model.vo; +package com.youlai.boot.platform.generator.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/platform/generator/model/vo/TablePageVO.java similarity index 93% rename from src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/platform/generator/model/vo/TablePageVO.java index 970cd5a8..7ae1f099 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/platform/generator/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.system.model.vo; +package com.youlai.boot.platform.generator.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java b/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java index b02d631c..8468d238 100644 --- a/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/GeneratorService.java @@ -2,9 +2,9 @@ package com.youlai.boot.platform.generator.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.platform.generator.model.form.GenConfigForm; -import com.youlai.boot.system.model.query.TablePageQuery; -import com.youlai.boot.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.platform.generator.model.query.TablePageQuery; +import com.youlai.boot.platform.generator.model.vo.GeneratorPreviewVO; +import com.youlai.boot.platform.generator.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java index 3bc12317..01bda26e 100644 --- a/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java @@ -19,17 +19,17 @@ import com.youlai.boot.config.property.GeneratorProperties; import com.youlai.boot.platform.generator.service.GenConfigService; import com.youlai.boot.platform.generator.service.GenFieldConfigService; import com.youlai.boot.platform.generator.service.GeneratorService; -import com.youlai.boot.system.converter.GenConfigConverter; +import com.youlai.boot.platform.generator.converter.GenConfigConverter; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.platform.generator.mapper.DatabaseMapper; -import com.youlai.boot.system.model.bo.ColumnMetaData; -import com.youlai.boot.system.model.bo.TableMetaData; +import com.youlai.boot.platform.generator.model.bo.ColumnMetaData; +import com.youlai.boot.platform.generator.model.bo.TableMetaData; import com.youlai.boot.platform.generator.model.entity.GenConfig; import com.youlai.boot.platform.generator.model.entity.GenFieldConfig; import com.youlai.boot.platform.generator.model.form.GenConfigForm; -import com.youlai.boot.system.model.query.TablePageQuery; -import com.youlai.boot.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.platform.generator.model.query.TablePageQuery; +import com.youlai.boot.platform.generator.model.vo.GeneratorPreviewVO; +import com.youlai.boot.platform.generator.model.vo.TablePageVO; import com.youlai.boot.system.service.MenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; diff --git a/src/main/resources/mapper/DatabaseMapper.xml b/src/main/resources/mapper/DatabaseMapper.xml index b04e4eb5..c652ebf5 100644 --- a/src/main/resources/mapper/DatabaseMapper.xml +++ b/src/main/resources/mapper/DatabaseMapper.xml @@ -5,7 +5,7 @@ - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -33,7 +33,7 @@ CREATE_TIME DESC - SELECT TABLE_NAME , TABLE_COMMENT , @@ -47,7 +47,7 @@ AND TABLE_NAME = #{tableName} - SELECT COLUMN_NAME, DATA_TYPE,