diff --git a/server/like-generator/pom.xml b/server/like-generator/pom.xml index 252ed9d9..678caae6 100644 --- a/server/like-generator/pom.xml +++ b/server/like-generator/pom.xml @@ -24,7 +24,6 @@ commons-collections commons-collections 3.2.2 - diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java new file mode 100644 index 00000000..e171a0a6 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -0,0 +1,17 @@ +package com.hxkj.generator.config; + +public class GenConfig { + + // 作者姓名 + public static String authorName = "LikeAdmin"; + + // 生成包名 + public static String packageName = "com.hxkj.like-admin"; + + // 表前缀名 + public static String tablePrefix = "ls_"; + + // 是否去除表前缀 + public static Boolean isRemoveTablePrefix = true; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index df776e96..450d788f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -1,11 +1,14 @@ package com.hxkj.generator.controller; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,7 +33,7 @@ public class GenController { @GetMapping("/db") public Object db(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult> list = iGenerateService.db(pageParam, params); + PageResult list = iGenerateService.db(pageParam, params); return AjaxResult.success(list); } @@ -40,10 +43,10 @@ public class GenController { * @author fzr * @return Object */ - @GetMapping("/genList") - public Object genList(@Validated PageParam pageParam, + @GetMapping("/list") + public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult> list = iGenerateService.genList(pageParam, params); + PageResult list = iGenerateService.list(pageParam, params); return AjaxResult.success(list); } @@ -53,9 +56,9 @@ public class GenController { * @author fzr * @return Object */ - @GetMapping("/genDetail") - public Object genDetail(@Validated @IDMust() @RequestParam("id") Integer id) { - Map maps = iGenerateService.genDetail(id); + @GetMapping("/detail") + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + Map maps = iGenerateService.detail(id); return AjaxResult.success(maps); } @@ -67,6 +70,7 @@ public class GenController { */ @PostMapping("/importTable") public Object importTable(String tables) { + Assert.notNull(tables, "tables参数缺失"); String[] tableNames = tables.split(","); iGenerateService.importTable(tableNames); return AjaxResult.success(); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 7a3424c6..4c848652 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -20,12 +20,12 @@ public class GenTable implements Serializable { private String tableComment; private String subTableName; private String subTableFk; + private String authorName; private String entityName; private String packageName; private String moduleName; private String businessName; private String functionName; - private String functionAuthor; private String genTpl; private Integer genType; private String genPath; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index b0d3376a..c891e938 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -3,6 +3,7 @@ package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -35,7 +36,7 @@ public interface GenTableMapper extends IBaseMapper { "AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))" + "", ""}) - List> selectDbTableList(Map params); + List selectDbTableList(Map params); /** * 根据表名集查询表 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index e901008b..e4af40fd 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -3,6 +3,8 @@ package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import java.util.List; import java.util.Map; @@ -20,7 +22,7 @@ public interface IGenerateService { * @param params 搜索参数 * @return PageResult> */ - PageResult> db(PageParam pageParam, Map params); + PageResult db(PageParam pageParam, Map params); /** * 生成列表 @@ -28,7 +30,7 @@ public interface IGenerateService { * @author fzr * @return Object */ - PageResult> genList(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, Map params); /** * 生成详情 @@ -36,7 +38,7 @@ public interface IGenerateService { * @author fzr * @return Object */ - Map genDetail(Integer id); + Map detail(Integer id); /** * 导入表结构 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index a922e7dc..a612a9fc 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,13 +1,17 @@ package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; +import com.hxkj.common.exception.OperateException; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.generator.config.GenConfig; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import com.hxkj.generator.mapper.GenTableColumnMapper; @@ -17,9 +21,13 @@ import com.hxkj.generator.util.GenUtil; import com.hxkj.generator.util.VelocityUtil; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenColumnVo; +import com.hxkj.generator.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,24 +56,20 @@ public class GenerateServiceImpl implements IGenerateService { * @return PageResult> */ @Override - public PageResult> db(PageParam pageParam, Map params) { + public PageResult db(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectDbTableList(params); + List tables = genTableMapper.selectDbTableList(params); - List> list = new LinkedList<>(); - for (Map item : tables) { - Map map = new LinkedHashMap<>(); - map.put("tableName", item.get("table_name")); - map.put("tableComment", item.get("table_comment")); - map.put("createTime", item.get("create_time")); - map.put("updateTime", item.getOrDefault("update_time", "")); - list.add(map); + for (DbTableVo vo : tables) { + if (vo.getUpdateTime() == null) { + vo.setUpdateTime(""); + } } - return PageResult.pageHelper(tables, list); + return PageResult.pageHelper(tables); } /** @@ -76,13 +80,13 @@ public class GenerateServiceImpl implements IGenerateService { * @return PageResult> */ @Override - public PageResult> genList(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("id"); - queryWrapper.select("id,entity_name,table_name,table_comment,create_time,update_time"); + queryWrapper.select("id,gen_tpl,entity_name,table_name,table_comment,create_time,update_time"); genTableMapper.setSearch(queryWrapper, params, new String[]{ "like:tableName@table_name:str", @@ -90,22 +94,18 @@ public class GenerateServiceImpl implements IGenerateService { "datetime:startTime-endTime@create_time:str" }); - PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectMaps(queryWrapper); + IPage iPage = genTableMapper.selectPage(new Page<>(page, limit), queryWrapper); - List> list = new LinkedList<>(); - for (Map item : tables) { - Map map = new LinkedHashMap<>(); - map.put("id", item.get("id")); - map.put("tableName", item.get("table_name")); - map.put("entityName", item.get("entity_name")); - map.put("tableComment", item.get("table_comment")); - map.put("createTime", TimeUtil.timestampToDate(item.get("create_time").toString())); - map.put("updateTime", TimeUtil.timestampToDate(item.get("update_time").toString())); - list.add(map); + List list = new LinkedList<>(); + for (GenTable item : iPage.getRecords()) { + GenTableVo vo = new GenTableVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + list.add(vo); } - return PageResult.pageHelper(tables, list); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** @@ -115,7 +115,7 @@ public class GenerateServiceImpl implements IGenerateService { * @return Object */ @Override - public Map genDetail(Integer id) { + public Map detail(Integer id) { Map maps = new LinkedHashMap<>(); GenTable genTable = genTableMapper.selectById(id); @@ -123,9 +123,10 @@ public class GenerateServiceImpl implements IGenerateService { Map base = new LinkedHashMap<>(); base.put("id", genTable.getId()); base.put("tableName", genTable.getTableName()); - base.put("entityName", genTable.getEntityName()); base.put("tableComment", genTable.getTableComment()); - base.put("functionAuthor", genTable.getFunctionName()); + base.put("entityName", genTable.getEntityName()); + base.put("authorName", genTable.getAuthorName()); + base.put("remarks", genTable.getRemarks()); base.put("createTime", TimeUtil.timestampToDate(genTable.getCreateTime())); base.put("updateTime", TimeUtil.timestampToDate(genTable.getUpdateTime())); maps.put("base", base); @@ -142,10 +143,17 @@ public class GenerateServiceImpl implements IGenerateService { maps.put("gen", gen); // 字段信息 - List columns = genTableColumnMapper.selectList( - new QueryWrapper() - .eq("table_id", id) - .orderByDesc("sort")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("table_id", id); + queryWrapper.orderByAsc("sort"); + List columns = new LinkedList<>(); + for (GenTableColumn item : genTableColumnMapper.selectList(queryWrapper)) { + GenColumnVo vo = new GenColumnVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + columns.add(vo); + } maps.put("column", columns); @@ -161,108 +169,117 @@ public class GenerateServiceImpl implements IGenerateService { @Override @Transactional public void importTable(String[] tableNames) { - List> tables = genTableMapper.selectDbTableListByNames(tableNames); + try { + List> tables = genTableMapper.selectDbTableListByNames(tableNames); - for (Map map : tables) { - // 生成表信息 - String tableName = map.get("table_name"); - String tableDesc = map.get("table_comment"); - GenTable table = new GenTable(); - table.setTableName(tableName); - table.setTableComment(tableDesc); - table.setEntityName(GenUtil.toClassName(tableName)); - table.setPackageName("com.hxkj.admin"); - table.setModuleName(GenUtil.toModuleName("com.hxkj.admin")); - table.setBusinessName(GenUtil.toBusinessName(tableName)); - table.setFunctionName(GenUtil.replaceText(tableDesc)); - table.setFunctionAuthor("likeAdmin"); - table.setCreateTime(System.currentTimeMillis() / 1000); - table.setUpdateTime(System.currentTimeMillis() / 1000); - int row = genTableMapper.insert(table); + for (Map map : tables) { + // 取基本数据 + String tableName = map.get("table_name"); + String tableDesc = map.get("table_comment"); - // 生成列信息 - if (row > 0) { - List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) { - String columnType = GenUtil.getDbType(column.getColumnType()); - String columnName = column.getColumnName(); + // 生成表信息 + GenTable table = new GenTable(); + table.setTableName(tableName); + table.setTableComment(tableDesc); + table.setAuthorName(GenConfig.authorName); + table.setEntityName(GenUtil.toClassName(tableName)); + table.setModuleName(GenUtil.toModuleName(GenConfig.packageName)); + table.setPackageName(GenConfig.packageName); + table.setBusinessName(GenUtil.toBusinessName(tableName)); + table.setFunctionName(GenUtil.replaceText(tableDesc)); + table.setCreateTime(System.currentTimeMillis() / 1000); + table.setUpdateTime(System.currentTimeMillis() / 1000); + int row = genTableMapper.insert(table); - column.setTableId(table.getId()); - column.setUpdateTime(table.getUpdateTime()); - column.setCreateTime(table.getCreateTime()); - column.setJavaField(StringUtil.toCamelCase(columnName)); - column.setJavaType("String"); - column.setQueryType("EQ"); - column.setIsInsert(GenConstants.REQUIRE); + // 生成列信息 + if (row > 0) { + List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); - if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || - GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { - Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) - ? GenConstants.HTML_TEXTAREA - : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } + for (GenTableColumn column : genTableColumns) { + String columnName = column.getColumnName(); + String columnType = GenUtil.getDbType(column.getColumnType()); + column.setTableId(table.getId()); + column.setJavaField(StringUtil.toCamelCase(columnName)); + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + column.setIsInsert(GenConstants.REQUIRE); + column.setUpdateTime(table.getUpdateTime()); + column.setCreateTime(table.getCreateTime()); - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } - - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { - column.setHtmlType(GenConstants.HTML_INPUT); - String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { - column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 - } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 - } else { - column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + // 文本域组 + if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || + GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { + Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) + ? GenConstants.HTML_TEXTAREA + : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); } - } - // 编辑字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { - column.setIsEdit(GenConstants.REQUIRE); - } + // 日期组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } - // 列表字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { - column.setIsList(GenConstants.REQUIRE); - } + // 数字组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { + column.setHtmlType(GenConstants.HTML_INPUT); + String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { + column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { + column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 + } else { + column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + } + } - // 查询字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { - column.setIsQuery(GenConstants.REQUIRE); - } + // 编辑字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + column.setIsEdit(GenConstants.REQUIRE); + } - // 查询字段类型 - if (StringUtil.endsWithIgnoreCase(columnName, "name")) { - column.setQueryType(GenConstants.QUERY_LIKE); - } + // 列表字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { + column.setIsList(GenConstants.REQUIRE); + } - // 根据字段设置 - if (StringUtil.endsWithIgnoreCase(columnName, "status")) { - // 状态字段设置单选框 - column.setHtmlType(GenConstants.HTML_RADIO); - } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || - StringUtil.endsWithIgnoreCase(columnName, "sex")) { - // 类型&性别字段设置下拉框 - column.setHtmlType(GenConstants.HTML_SELECT); - } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { - // 图片字段设置图片上传控件 - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { - // 文件字段设置文件上传控件 - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { - // 内容字段设置富文本控件 - column.setHtmlType(GenConstants.HTML_EDITOR); - } + // 查询字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { + column.setIsQuery(GenConstants.REQUIRE); + } - genTableColumnMapper.insert(column); + // 查询字段类型 + if (StringUtil.endsWithIgnoreCase(columnName, "name")) { + column.setQueryType(GenConstants.QUERY_LIKE); + } + + // 根据字段设置 + if (StringUtil.endsWithIgnoreCase(columnName, "status")) { + // 状态字段设置单选框 + column.setHtmlType(GenConstants.HTML_RADIO); + } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || + StringUtil.endsWithIgnoreCase(columnName, "sex")) { + // 类型&性别字段设置下拉框 + column.setHtmlType(GenConstants.HTML_SELECT); + } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { + // 图片字段设置图片上传控件 + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { + // 文件字段设置文件上传控件 + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { + // 内容字段的设置富文本控件 + column.setHtmlType(GenConstants.HTML_EDITOR); + } + + genTableColumnMapper.insert(column); + } } } + } catch (Exception e) { + throw new OperateException("导入失败：" + e.getMessage()); } } @@ -279,15 +296,15 @@ public class GenerateServiceImpl implements IGenerateService { Assert.notNull(model, "数据已丢失"); model.setTableName(genParam.getTableName()); - model.setEntityName(genParam.getEntityName()); model.setTableComment(genParam.getTableComment()); - model.setFunctionAuthor(genParam.getFunctionAuthor()); - model.setRemarks(genParam.getRemarks()); - model.setGenTpl(genParam.getGenTpl()); + model.setAuthorName(genParam.getAuthorName()); + model.setEntityName(genParam.getEntityName()); model.setModuleName(genParam.getModuleName()); model.setPackageName(genParam.getPackageName()); model.setBusinessName(genParam.getBusinessName()); model.setFunctionName(genParam.getFunctionName()); + model.setRemarks(genParam.getRemarks()); + model.setGenTpl(genParam.getGenTpl()); model.setGenType(genParam.getGenType()); model.setGenPath(genParam.getGenPath()); genTableMapper.updateById(model); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 2dc8679c..f6a30039 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -132,4 +132,8 @@ public class GenUtil { } } + public static void setPkColumn() { + + } + } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 6eedd619..689f87bb 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -54,7 +54,7 @@ public class VelocityUtil { velocityContext.put("BusinessName", StringUtil.capitalize(genTable.getBusinessName())); velocityContext.put("businessName", genTable.getBusinessName()); velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("author", genTable.getAuthorName()); velocityContext.put("datetime", TimeUtil.nowDate()); return velocityContext; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index 5c454daf..3d5e9d29 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -40,10 +40,10 @@ public class GenParam implements Serializable { @Length(min = 1, max = 200, message = "表描述不能大于200个字符") private String tableComment; - @NotNull(message = "functionAuthor参数缺失") - @NotEmpty(message = "表描述不能为空") - @Length(min = 1, max = 60, message = "表描述不能大于200个字符") - private String functionAuthor; + @NotNull(message = "authorName参数缺失") + @NotEmpty(message = "作者名称不能为空") + @Length(min = 1, max = 100, message = "作者名称不能大于60个字符") + private String authorName; @Length(max = 60, message = "备注不能大于200个字符") private String remarks; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java new file mode 100644 index 00000000..2eaad1da --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java @@ -0,0 +1,20 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/*** + * 表实体 + */ +@Data +public class DbTableVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String tableName; // 表的名称 + private String tableComment; // 表的描述 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java new file mode 100644 index 00000000..1f255b49 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java @@ -0,0 +1,32 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/*** + * 列实体 + */ +@Data +public class GenColumnVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 主键 + private String columnName; // 字段名称 + private String columnComment; // 字段描述 + private String columnType; // 字段类型 + private String javaType; // JAVA类型 + private String javaField; // JAVA字段 + private Integer isRequired; // 是否必填 + private Integer isInsert; // 是否插入字段 + private Integer isEdit; // 是否编辑字段 + private Integer isList; // 是否列表字段 + private Integer isQuery; // 是否查询字段 + private String queryType; // 查询方式: [等于、不等于、大于、小于、范围] + private String htmlType; // 显示类型: [文本框、文本域、下拉框、复选框、单选框、日期控件] + private String dictType; // 字典类型 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java new file mode 100644 index 00000000..eb1e0e42 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -0,0 +1,22 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 生成表实体 + */ +@Data +public class GenTableVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 生成主键 + private String genTpl; // 生成模板 + private String tableName; // 表的名称 + private String tableComment; // 表的描述 + private String createTime; // 创建时间 + private String updateTime; // 删除时间 + +}