diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/GenConstants.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/GenConstants.java index 0fb2fd6..14cb0c6 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/GenConstants.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/GenConstants.java @@ -35,6 +35,9 @@ public class GenConstants public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text", "mediumtext", "longtext" }; + /** 数据库文本类型 */ + public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; + /** 数据库时间类型 */ public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java index 23c0433..28c6d4a 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java @@ -23,8 +23,8 @@ import com.hchyun.common.core.domain.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.text.Convert; import com.hchyun.common.enums.BusinessType; -import com.hchyun.generator.domain.GenTable; -import com.hchyun.generator.domain.GenTableColumn; +import com.hchyun.generator.entity.GenTable; +import com.hchyun.generator.entity.GenTableColumn; import com.hchyun.generator.service.IGenTableColumnService; import com.hchyun.generator.service.IGenTableService; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableColumnMapper.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java similarity index 93% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableColumnMapper.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java index 26f7eed..ee8370a 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableColumnMapper.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.hchyun.generator.mapper; +package com.hchyun.generator.dao; import java.util.List; -import com.hchyun.generator.domain.GenTableColumn; +import com.hchyun.generator.entity.GenTableColumn; /** * 业务字段 数据层 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableMapper.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java similarity index 95% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableMapper.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java index 6bbba3e..bed4fff 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/mapper/GenTableMapper.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.hchyun.generator.mapper; +package com.hchyun.generator.dao; import java.util.List; -import com.hchyun.generator.domain.GenTable; +import com.hchyun.generator.entity.GenTable; /** * 业务 数据层 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTable.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java similarity index 99% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTable.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java index 685e2c1..25ef942 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTable.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.hchyun.generator.domain; +package com.hchyun.generator.entity; import java.util.List; import javax.validation.Valid; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTableColumn.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java similarity index 99% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTableColumn.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java index 95228ba..c893bda 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/domain/GenTableColumn.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.hchyun.generator.domain; +package com.hchyun.generator.entity; import javax.validation.constraints.NotBlank; import com.hchyun.common.core.domain.BaseEntity; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java index 538677a..3c63694 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java @@ -4,8 +4,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hchyun.common.core.text.Convert; -import com.hchyun.generator.domain.GenTableColumn; -import com.hchyun.generator.mapper.GenTableColumnMapper; +import com.hchyun.generator.entity.GenTableColumn; +import com.hchyun.generator.dao.GenTableColumnMapper; /** * 业务字段 服务层实现 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java index a3c4d82..93f7fbf 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java @@ -28,10 +28,10 @@ import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.file.FileUtils; -import com.hchyun.generator.domain.GenTable; -import com.hchyun.generator.domain.GenTableColumn; -import com.hchyun.generator.mapper.GenTableColumnMapper; -import com.hchyun.generator.mapper.GenTableMapper; +import com.hchyun.generator.entity.GenTable; +import com.hchyun.generator.entity.GenTableColumn; +import com.hchyun.generator.dao.GenTableColumnMapper; +import com.hchyun.generator.dao.GenTableMapper; import com.hchyun.generator.util.GenUtils; import com.hchyun.generator.util.VelocityInitializer; import com.hchyun.generator.util.VelocityUtils; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableColumnService.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableColumnService.java index b7c7631..e4c758f 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableColumnService.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableColumnService.java @@ -1,7 +1,7 @@ package com.hchyun.generator.service; import java.util.List; -import com.hchyun.generator.domain.GenTableColumn; +import com.hchyun.generator.entity.GenTableColumn; /** * 业务字段 服务层 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java index dc90f8c..6e44b6c 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java @@ -2,7 +2,7 @@ package com.hchyun.generator.service; import java.util.List; import java.util.Map; -import com.hchyun.generator.domain.GenTable; +import com.hchyun.generator.entity.GenTable; /** * 业务 服务层 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/GenUtils.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/GenUtils.java index aca844f..870241e 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/GenUtils.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/GenUtils.java @@ -5,8 +5,8 @@ import org.apache.commons.lang3.RegExUtils; import com.hchyun.common.constant.GenConstants; import com.hchyun.common.utils.StringUtils; import com.hchyun.generator.config.GenConfig; -import com.hchyun.generator.domain.GenTable; -import com.hchyun.generator.domain.GenTableColumn; +import com.hchyun.generator.entity.GenTable; +import com.hchyun.generator.entity.GenTableColumn; /** * 代码生成器 工具类 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java index 844f005..fbeb2aa 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java @@ -8,8 +8,8 @@ import com.alibaba.fastjson.JSONObject; import com.hchyun.common.constant.GenConstants; import com.hchyun.common.utils.DateUtils; import com.hchyun.common.utils.StringUtils; -import com.hchyun.generator.domain.GenTable; -import com.hchyun.generator.domain.GenTableColumn; +import com.hchyun.generator.entity.GenTable; +import com.hchyun.generator.entity.GenTableColumn; /** * 模板处理工具类 diff --git a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 5fa790f..e7d2423 100644 --- a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 3162379..1152f99 100644 --- a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - +