From ada8e6b3776f4877ccb9fe2c9405006cd5108d1f Mon Sep 17 00:00:00 2001 From: zhoyou <18525788842@163.com> Date: Thu, 9 Jan 2020 10:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generatormd/biz/TGenerateInfoBiz.java | 20 + .../controller/TGenerateInfoController.java | 23 ++ .../entity/TGenerateInfoEntity.java | 53 +++ .../mapper/TGenerateInfoMapper.java | 15 + .../productionmd/entity/TableEntity.java | 12 + .../service/SysGeneratorService.java | 5 +- .../security/generator/utils/GenUtils.java | 364 +++++++++--------- .../src/main/resources/generator.properties | 2 +- .../generatormd/TGenerateInfoMapper.xml | 29 ++ .../userprojectmd/TProjectUserMapper.xml | 3 +- .../src/main/resources/template/Mapper.xml.vm | 4 +- .../security/common/entity/BaseEntity.java | 2 +- 12 files changed, 345 insertions(+), 187 deletions(-) create mode 100644 neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/biz/TGenerateInfoBiz.java create mode 100644 neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/controller/TGenerateInfoController.java create mode 100644 neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/entity/TGenerateInfoEntity.java create mode 100644 neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/mapper/TGenerateInfoMapper.java create mode 100644 neuray-pm-base-server/base-code-generator/src/main/resources/mapper/generatormd/TGenerateInfoMapper.xml diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/biz/TGenerateInfoBiz.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/biz/TGenerateInfoBiz.java new file mode 100644 index 0000000..bb5b556 --- /dev/null +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/biz/TGenerateInfoBiz.java @@ -0,0 +1,20 @@ +package com.gitee.neuray.security.generator.generatormd.biz; + +import org.springframework.stereotype.Service; +import java.util.Map; +import org.springframework.transaction.annotation.Transactional; +import tk.mybatis.mapper.common.Mapper; +import com.gitee.neuray.security.common.biz.BaseBiz; + +import com.gitee.neuray.security.generator.generatormd.mapper.TGenerateInfoMapper; +import com.gitee.neuray.security.generator.generatormd.entity.TGenerateInfoEntity; + + +@Service +@Transactional(rollbackFor = Exception.class) +public class TGenerateInfoBiz extends BaseBiz { + @Override + protected String getPageName() { + return "TGenerateInfo"+"Biz"; + } +} diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/controller/TGenerateInfoController.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/controller/TGenerateInfoController.java new file mode 100644 index 0000000..932c554 --- /dev/null +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/controller/TGenerateInfoController.java @@ -0,0 +1,23 @@ +package com.gitee.neuray.security.generator.generatormd.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.gitee.neuray.security.common.rest.BaseController; + +import com.gitee.neuray.security.generator.generatormd.entity.TGenerateInfoEntity; +import com.gitee.neuray.security.generator.generatormd.biz.TGenerateInfoBiz; + + + +/** + * 代码生成器-代码生成信息 + * + * @author zhhongyu + * @email ${email} + * @date 2020-01-09 10:45:47 + */ +@RestController +@RequestMapping("generatormd") +public class TGenerateInfoController extends BaseController{ + +} diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/entity/TGenerateInfoEntity.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/entity/TGenerateInfoEntity.java new file mode 100644 index 0000000..bccf694 --- /dev/null +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/entity/TGenerateInfoEntity.java @@ -0,0 +1,53 @@ +package com.gitee.neuray.security.generator.generatormd.entity; + +import com.gitee.neuray.security.common.entity.BaseEntity; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Table; + +import java.util.Date; + +/** + * 代码生成器-代码生成信息 + * + * @author zhhongyu + * @email ${email} + * @date 2020-01-09 10:45:47 + */ +@Data +@Table(name = "T_GENERATE_INFO") +public class TGenerateInfoEntity extends BaseEntity { + + + /** + * 主题名称 + */ + @Column(name = "G_NAME") + private String gName; + + /** + * 项目ID + */ + @Column(name = "PROJECT_ID") + private String projectId; + + /** + * VUE路径 + */ + @Column(name = "VUE_PATH") + private String vuePath; + + /** + * JAVA路径 + */ + @Column(name = "JAVA_PATH") + private String javaPath; + + /** + * $column.comments + */ + @Column(name = "REMARK") + private String remark; + +} diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/mapper/TGenerateInfoMapper.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/mapper/TGenerateInfoMapper.java new file mode 100644 index 0000000..4dcc94e --- /dev/null +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/generatormd/mapper/TGenerateInfoMapper.java @@ -0,0 +1,15 @@ +package com.gitee.neuray.security.generator.generatormd.mapper; + +import com.gitee.neuray.security.generator.generatormd.entity.TGenerateInfoEntity; +import tk.mybatis.mapper.common.Mapper; + +/** + * 代码生成器-代码生成信息 + * + * @author zhhongyu + * @email ${email} + * @date 2020-01-09 10:45:47 + */ +public interface TGenerateInfoMapper extends Mapper { + +} diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/entity/TableEntity.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/entity/TableEntity.java index 5eee53a..58503a8 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/entity/TableEntity.java +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/entity/TableEntity.java @@ -20,6 +20,10 @@ public class TableEntity { private String className; //类名(第一个字母小写)，如：sys_user => sysUser private String classname; + /* + 渲染mapper.xml用 + */ + private List mapperColumns; public String getTableName() { return tableName; @@ -68,4 +72,12 @@ public class TableEntity { public void setClassname(String classname) { this.classname = classname; } + + public List getMapperColumns() { + return mapperColumns; + } + + public void setMapperColumns(List mapperColumns) { + this.mapperColumns = mapperColumns; + } } diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/service/SysGeneratorService.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/service/SysGeneratorService.java index 774ed32..a055422 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/service/SysGeneratorService.java +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/productionmd/service/SysGeneratorService.java @@ -62,12 +62,13 @@ public class SysGeneratorService { String name = declaredAnnotation.name(); baseEntityDeclares.add(name); } - columns = columns.stream().filter(map -> { + List> nobaseColumns = null; + nobaseColumns = columns.stream().filter(map -> { String columnName = map.get("columnName"); return !baseEntityDeclares.parallelStream().anyMatch(baseColumn -> Objects.equals(columnName,baseColumn)); }).collect(Collectors.toList()); //生成代码 - GenUtils.generatorCode(table, columns, zip); + GenUtils.generatorCode(table, nobaseColumns,columns, zip); } IOUtils.closeQuietly(zip); return outputStream.toByteArray(); diff --git a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/utils/GenUtils.java b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/utils/GenUtils.java index 683eb0f..d1eff4f 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/utils/GenUtils.java +++ b/neuray-pm-base-server/base-code-generator/src/main/java/com/gitee/neuray/security/generator/utils/GenUtils.java @@ -22,189 +22,193 @@ import java.util.zip.ZipOutputStream; /** * 代码生成器 工具类 - * */ public class GenUtils { - public static List getTemplates(){ - List templates = new ArrayList(); - templates.add("template/Entity.java.vm"); - templates.add("template/Mapper.java.vm"); - templates.add("template/Mapper.xml.vm"); - templates.add("template/Biz.java.vm"); - templates.add("template/Controller.java.vm"); - templates.add("template/list.vue.vm"); - templates.add("template/list.js.vm"); - templates.add("template/menu.sql.vm"); - return templates; - } - - /** - * 生成代码 - */ - public static void generatorCode(Map table, - List> columns, ZipOutputStream zip){ - //配置信息 - Configuration config = getConfig(); - boolean hasBigDecimal = false; - //表信息 - TableEntity tableEntity = new TableEntity(); - tableEntity.setTableName(table.get("tableName")); - tableEntity.setComments(table.get("tableComment")); - //表名转换成Java类名 - String className = tableToJava(tableEntity.getTableName(), config.getString("tablePrefix")); - tableEntity.setClassName(className); - tableEntity.setClassname(StringUtils.uncapitalize(className)); - - //列信息 - List columsList = new ArrayList<>(); - for(Map column : columns){ - ColumnEntity columnEntity = new ColumnEntity(); - columnEntity.setColumnName(column.get("columnName")); - columnEntity.setDataType(column.get("dataType")); - columnEntity.setComments(column.get("columnComment")); - columnEntity.setExtra(column.get("extra")); - - //列名转换成Java属性名 - String attrName = columnToJava(columnEntity.getColumnName()); - columnEntity.setAttrName(attrName); - columnEntity.setAttrname(StringUtils.uncapitalize(attrName)); - - //列的数据类型，转换成Java类型 - String attrType = config.getString(columnEntity.getDataType(), "unknowType"); - columnEntity.setAttrType(attrType); - if (!hasBigDecimal && attrType.equals("BigDecimal" )) { - hasBigDecimal = true; - } - //是否主键 - if("PRI".equalsIgnoreCase(column.get("columnKey")) && tableEntity.getPk() == null){ - tableEntity.setPk(columnEntity); - } - - columsList.add(columnEntity); - } - tableEntity.setColumns(columsList); - - //没主键，则第一个字段为主键 - if(tableEntity.getPk() == null){ - tableEntity.setPk(tableEntity.getColumns().get(0)); - } - - //设置velocity资源加载器 - Properties prop = new Properties(); - prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - Velocity.init(prop); - - String mainPath = config.getString("mainPath" ); - mainPath = StringUtils.isBlank(mainPath) ? "io.renren" : mainPath; - - //封装模板数据 - Map map = new HashMap<>(); - map.put("tableName", tableEntity.getTableName()); - map.put("comments", tableEntity.getComments()); - map.put("pk", tableEntity.getPk()); - map.put("className", tableEntity.getClassName()); - map.put("classname", tableEntity.getClassname()); - map.put("pathName", tableEntity.getClassname().toLowerCase()); - map.put("columns", tableEntity.getColumns()); - map.put("hasBigDecimal", hasBigDecimal); - map.put("mainPath", mainPath); - map.put("package", config.getString("package" )); - map.put("moduleName", config.getString("moduleName" )); - map.put("author", config.getString("author")); - map.put("email", config.getString("email")); - map.put("datetime", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN)); + public static List getTemplates() { + List templates = new ArrayList(); + templates.add("template/Entity.java.vm"); + templates.add("template/Mapper.java.vm"); + templates.add("template/Mapper.xml.vm"); + templates.add("template/Biz.java.vm"); + templates.add("template/Controller.java.vm"); + templates.add("template/list.vue.vm"); + templates.add("template/list.js.vm"); + templates.add("template/menu.sql.vm"); + return templates; + } + + /** + * 生成代码 + */ + public static void generatorCode(Map table, + List> nobaseColumns, List> allColumns, ZipOutputStream zip) { + //配置信息 + Configuration config = getConfig(); + boolean hasBigDecimal = false; + //表信息 + TableEntity tableEntity = new TableEntity(); + tableEntity.setTableName(table.get("tableName")); + tableEntity.setComments(table.get("tableComment")); + //表名转换成Java类名 + String className = tableToJava(tableEntity.getTableName(), config.getString("tablePrefix")); + tableEntity.setClassName(className); + tableEntity.setClassname(StringUtils.uncapitalize(className)); + + List noBaseColumns = getColumns(nobaseColumns, config, tableEntity, hasBigDecimal); + List columns = getColumns(allColumns, config, tableEntity, hasBigDecimal); + tableEntity.setColumns(noBaseColumns); + tableEntity.setMapperColumns(columns); + //没主键，则第一个字段为主键 + if (tableEntity.getPk() == null) { + tableEntity.setPk(tableEntity.getColumns().get(0)); + } + //设置velocity资源加载器 + Properties prop = new Properties(); + prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + Velocity.init(prop); + String mainPath = config.getString("mainPath"); + mainPath = StringUtils.isBlank(mainPath) ? "io.renren" : mainPath; + //封装模板数据 + Map map = new HashMap<>(); + map.put("tableName", tableEntity.getTableName()); + map.put("comments", tableEntity.getComments()); + map.put("pk", tableEntity.getPk()); + map.put("className", tableEntity.getClassName()); + map.put("classname", tableEntity.getClassname()); + map.put("pathName", tableEntity.getClassname().toLowerCase()); + map.put("columns", tableEntity.getColumns()); + map.put("mapperColumns", tableEntity.getMapperColumns()); + map.put("hasBigDecimal", hasBigDecimal); + map.put("mainPath", mainPath); + map.put("package", config.getString("package")); + map.put("moduleName", config.getString("moduleName")); + map.put("author", config.getString("author")); + map.put("email", config.getString("email")); + map.put("datetime", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN)); VelocityContext context = new VelocityContext(map); - //获取模板列表 - List templates = getTemplates(); - for(String template : templates){ - //渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, "UTF-8"); - tpl.merge(context, sw); - - try { - //添加到zip - zip.putNextEntry(new ZipEntry(getFileName(template, tableEntity.getClassName(), config.getString("package"), config.getString("moduleName")))); - IOUtils.write(sw.toString(), zip, "UTF-8"); - IOUtils.closeQuietly(sw); - zip.closeEntry(); - } catch (IOException e) { - throw new BaseException("渲染模板失败，表名：" + tableEntity.getTableName(), e); - } - } - } - - - /** - * 列名转换成Java属性名 - */ - public static String columnToJava(String columnName) { - return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", ""); - } - - /** - * 表名转换成Java类名 - */ - public static String tableToJava(String tableName, String tablePrefix) { - if(StringUtils.isNotBlank(tablePrefix)){ - tableName = tableName.replace(tablePrefix, ""); - } - return columnToJava(tableName); - } - - /** - * 获取配置信息 - */ - public static Configuration getConfig(){ - try { - return new PropertiesConfiguration("generator.properties"); - } catch (ConfigurationException e) { - throw new BaseException("获取配置文件失败，", e); - } - } - - /** - * 获取文件名 - */ - public static String getFileName(String template, String className, String packageName, String moduleName) { - String packagePath = "main" + File.separator + "java" + File.separator; - if (StringUtils.isNotBlank(packageName)) { - packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator; - } - - if (template.contains("Entity.java.vm" )) { - return packagePath + "entity" + File.separator + className + "Entity.java"; - } - - if (template.contains("Mapper.java.vm" )) { - return packagePath + "mapper" + File.separator + className + "Mapper.java"; - } - if (template.contains("Biz.java.vm" )) { - return packagePath + "biz" + File.separator + className + "Biz.java"; - } - - if (template.contains("Controller.java.vm" )) { - return packagePath + "controller" + File.separator + className + "Controller.java"; - } - - if (template.contains("Mapper.xml.vm" )) { - return "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + moduleName + File.separator + className + "Mapper.xml"; - } - - if (template.contains("list.vue.vm" )) { - return "src" + File.separator + "views" + File.separator + moduleName + File.separator + className.toLowerCase() + ".vue"; - } - - if (template.contains("list.js.vm" )) { - return "src" + File.separator + "views" + File.separator + moduleName + File.separator + className.toLowerCase() + ".js"; - } - - if (template.contains("menu.sql.vm" )) { - return className.toLowerCase() + "_menu.sql"; - } - - return null; - } + List templates = getTemplates(); + for (String template : templates) { + //渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, "UTF-8"); + tpl.merge(context, sw); + + try { + //添加到zip + zip.putNextEntry(new ZipEntry(getFileName(template, tableEntity.getClassName(), config.getString("package"), config.getString("moduleName")))); + IOUtils.write(sw.toString(), zip, "UTF-8"); + IOUtils.closeQuietly(sw); + zip.closeEntry(); + } catch (IOException e) { + throw new BaseException("渲染模板失败，表名：" + tableEntity.getTableName(), e); + } + } + } + + private static List getColumns(List> columns, + Configuration config, + TableEntity tableEntity, + boolean hasBigDecimal) { + //列信息 + List columsList = new ArrayList<>(); + for (Map column : columns) { + ColumnEntity columnEntity = new ColumnEntity(); + columnEntity.setColumnName(column.get("columnName")); + columnEntity.setDataType(column.get("dataType")); + columnEntity.setComments(column.get("columnComment")); + columnEntity.setExtra(column.get("extra")); + + //列名转换成Java属性名 + String attrName = columnToJava(columnEntity.getColumnName()); + columnEntity.setAttrName(attrName); + columnEntity.setAttrname(StringUtils.uncapitalize(attrName)); + + //列的数据类型，转换成Java类型 + String attrType = config.getString(columnEntity.getDataType(), "unknowType"); + columnEntity.setAttrType(attrType); + if (!hasBigDecimal && attrType.equals("BigDecimal")) { + hasBigDecimal = true; + } + //是否主键 + if ("PRI".equalsIgnoreCase(column.get("columnKey")) && tableEntity.getPk() == null) { + tableEntity.setPk(columnEntity); + } + columsList.add(columnEntity); + } + return columsList; + } + + + /** + * 列名转换成Java属性名 + */ + public static String columnToJava(String columnName) { + return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", ""); + } + + /** + * 表名转换成Java类名 + */ + public static String tableToJava(String tableName, String tablePrefix) { + if (StringUtils.isNotBlank(tablePrefix)) { + tableName = tableName.replace(tablePrefix, ""); + } + return columnToJava(tableName); + } + + /** + * 获取配置信息 + */ + public static Configuration getConfig() { + try { + return new PropertiesConfiguration("generator.properties"); + } catch (ConfigurationException e) { + throw new BaseException("获取配置文件失败，", e); + } + } + + /** + * 获取文件名 + */ + public static String getFileName(String template, String className, String packageName, String moduleName) { + String packagePath = "main" + File.separator + "java" + File.separator; + if (StringUtils.isNotBlank(packageName)) { + packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator; + } + + if (template.contains("Entity.java.vm")) { + return packagePath + "entity" + File.separator + className + "Entity.java"; + } + + if (template.contains("Mapper.java.vm")) { + return packagePath + "mapper" + File.separator + className + "Mapper.java"; + } + if (template.contains("Biz.java.vm")) { + return packagePath + "biz" + File.separator + className + "Biz.java"; + } + + if (template.contains("Controller.java.vm")) { + return packagePath + "controller" + File.separator + className + "Controller.java"; + } + + if (template.contains("Mapper.xml.vm")) { + return "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + moduleName + File.separator + className + "Mapper.xml"; + } + + if (template.contains("list.vue.vm")) { + return "src" + File.separator + "views" + File.separator + moduleName + File.separator + className.toLowerCase() + ".vue"; + } + + if (template.contains("list.js.vm")) { + return "src" + File.separator + "views" + File.separator + moduleName + File.separator + className.toLowerCase() + ".js"; + } + + if (template.contains("menu.sql.vm")) { + return className.toLowerCase() + "_menu.sql"; + } + + return null; + } } diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/generator.properties b/neuray-pm-base-server/base-code-generator/src/main/resources/generator.properties index e717318..7f16938 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/generator.properties +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/generator.properties @@ -1,7 +1,7 @@ #代码生成器，配置信息 #包名 package=com.gitee.neuray.security.generator -moduleName=userprojectmd +moduleName=generatormd #作者 author=zhhongyu #表前缀(类名不会包含表前缀) diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/generatormd/TGenerateInfoMapper.xml b/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/generatormd/TGenerateInfoMapper.xml new file mode 100644 index 0000000..4810f2f --- /dev/null +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/generatormd/TGenerateInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/userprojectmd/TProjectUserMapper.xml b/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/userprojectmd/TProjectUserMapper.xml index 4048250..1d74b47 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/userprojectmd/TProjectUserMapper.xml +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/mapper/userprojectmd/TProjectUserMapper.xml @@ -5,6 +5,7 @@ + @@ -22,4 +23,4 @@ - \ No newline at end of file + diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/template/Mapper.xml.vm b/neuray-pm-base-server/base-code-generator/src/main/resources/template/Mapper.xml.vm index 3dd90f7..10ce34b 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/template/Mapper.xml.vm +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/template/Mapper.xml.vm @@ -5,10 +5,10 @@ -#foreach($column in $columns) +#foreach($column in $mapperColumns) #end - \ No newline at end of file + diff --git a/neuray-pm-common/src/main/java/com/gitee/neuray/security/common/entity/BaseEntity.java b/neuray-pm-common/src/main/java/com/gitee/neuray/security/common/entity/BaseEntity.java index 91178eb..65c5c8b 100644 --- a/neuray-pm-common/src/main/java/com/gitee/neuray/security/common/entity/BaseEntity.java +++ b/neuray-pm-common/src/main/java/com/gitee/neuray/security/common/entity/BaseEntity.java @@ -15,7 +15,7 @@ import java.util.Date; public class BaseEntity { @Id - @Column(name = "Id") + @Column(name = "ID") private String id; @Column(name = "CRT_TIME") -- Gitee