diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java index 212fe008..65f48157 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java @@ -30,7 +30,7 @@ public class DbReadTableUtil { public static void main(String[] args) throws SQLException { try { - List list = listOneColumnVo("demo"); + List list = listColumns("demo"); Iterator iterator = list.iterator(); while(iterator.hasNext()) { @@ -103,7 +103,7 @@ public class DbReadTableUtil { return list; } - public static List listOneColumnVo(String tableName) throws Exception { + public static List listColumns(String tableName) throws Exception { String sqlStr = null; ArrayList list = new ArrayList(); @@ -222,7 +222,7 @@ public class DbReadTableUtil { return result; } - public static List listOneToManyColumnVo(String tableName) throws Exception { + public static List listOriginalColumns(String tableName) throws Exception { ResultSet resultSet = null; String sqlStr = null; ArrayList list = new ArrayList(); @@ -334,7 +334,7 @@ public class DbReadTableUtil { } public static boolean c(String var0) { - String var2 = null; + String sqlStr = null; try { log.debug("数据库驱动: " + com.jero.codegenerate.properties.CodeConfigProperties.driverName); @@ -344,27 +344,27 @@ public class DbReadTableUtil { String var3 = connection.getCatalog(); log.info(" connect databaseName : " + var3); if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("mysql")) { - var2 = "select column_name,data_type,column_comment,0,0 from information_schema.columns where table_name = '" + var0 + "' and table_schema = '" + var3 + "'"; + sqlStr = "select column_name,data_type,column_comment,0,0 from information_schema.columns where table_name = '" + var0 + "' and table_schema = '" + var3 + "'"; } if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("oracle")) { - var2 = "select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment from user_tab_cols colstable inner join user_col_comments commentstable on colstable.column_name = commentstable.column_name where colstable.table_name = commentstable.table_name and colstable.table_name = '" + var0.toUpperCase() + "'"; + sqlStr = "select colstable.column_name column_name, colstable.data_type data_type, commentstable.comments column_comment from user_tab_cols colstable inner join user_col_comments commentstable on colstable.column_name = commentstable.column_name where colstable.table_name = commentstable.table_name and colstable.table_name = '" + var0.toUpperCase() + "'"; } if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("postgresql")) { - var2 = MessageFormat.format("select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name", TableConvert.c(var0), TableConvert.c(var0)); + sqlStr = MessageFormat.format("select icm.column_name as field,icm.udt_name as type,fieldtxt.descript as comment, icm.numeric_precision_radix as column_precision ,icm.numeric_scale as column_scale ,icm.character_maximum_length as Char_Length,icm.is_nullable as attnotnull from information_schema.columns icm, (SELECT A.attnum,( SELECT description FROM pg_catalog.pg_description WHERE objoid = A.attrelid AND objsubid = A.attnum ) AS descript,A.attname FROM\tpg_catalog.pg_attribute A WHERE A.attrelid = ( SELECT oid FROM pg_class WHERE relname = {0} ) AND A.attnum > 0 AND NOT A.attisdropped ORDER BY\tA.attnum ) fieldtxt where icm.table_name={1} and fieldtxt.attname = icm.column_name", TableConvert.c(var0), TableConvert.c(var0)); } if (com.jero.codegenerate.properties.CodeConfigProperties.databaseType.equals("sqlserver")) { - var2 = MessageFormat.format("select distinct cast(a.name as varchar(50)) column_name, cast(b.name as varchar(50)) data_type, cast(e.value as NVARCHAR(200)) comment, cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision, cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale, a.max_length, (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0} order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id", TableConvert.c(var0)); + sqlStr = MessageFormat.format("select distinct cast(a.name as varchar(50)) column_name, cast(b.name as varchar(50)) data_type, cast(e.value as NVARCHAR(200)) comment, cast(ColumnProperty(a.object_id,a.Name,'''Precision''') as int) num_precision, cast(ColumnProperty(a.object_id,a.Name,'''Scale''') as int) num_scale, a.max_length, (case when a.is_nullable=1 then '''y''' else '''n''' end) nullable,column_id from sys.columns a left join sys.types b on a.user_type_id=b.user_type_id left join (select top 1 * from sys.objects where type = '''U''' and name ={0} order by name) c on a.object_id=c.object_id left join sys.extended_properties e on e.major_id=c.object_id and e.minor_id=a.column_id and e.class=1 where c.name={0} order by a.column_id", TableConvert.c(var0)); } - ResultSet var1 = statement.executeQuery(var2); - var1.last(); - int var4 = var1.getRow(); - return var4 > 0; - } catch (Exception var5) { - var5.printStackTrace(); + ResultSet resultSet = statement.executeQuery(sqlStr); + resultSet.last(); + int row = resultSet.getRow(); + return row > 0; + } catch (Exception e) { + e.printStackTrace(); return false; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java index 7f6ff0c7..cbb422b1 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java @@ -17,56 +17,56 @@ import com.jero.codegenerate.generate.util.NonceUtils; @Slf4j public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { - private TableVo b; - private List e; - private List f; + private TableVo tableVo; + private List columns; + private List originalColumns; public CodeGenerateOne(TableVo tableVo) { - this.b = tableVo; + this.tableVo = tableVo; } public CodeGenerateOne(TableVo tableVo, List columns, List originalColumns) { - this.b = tableVo; - this.e = columns; - this.f = originalColumns; + this.tableVo = tableVo; + this.columns = columns; + this.originalColumns = originalColumns; } public Map a() throws Exception { HashMap var1 = new HashMap(); var1.put("bussiPackage", com.jero.codegenerate.properties.CodeConfigProperties.packageName); - var1.put("entityPackage", this.b.getEntityPackage()); - var1.put("entityName", this.b.getEntityName()); - var1.put("tableName", this.b.getTableName()); + var1.put("entityPackage", this.tableVo.getEntityPackage()); + var1.put("entityName", this.tableVo.getEntityName()); + var1.put("tableName", this.tableVo.getTableName()); var1.put("primaryKeyField", com.jero.codegenerate.properties.CodeConfigProperties.dbTableId); - if (this.b.getFieldRequiredNum() == null) { - this.b.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1); + if (this.tableVo.getFieldRequiredNum() == null) { + this.tableVo.setFieldRequiredNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.m) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.m) : -1); } - if (this.b.getSearchFieldNum() == null) { - this.b.setSearchFieldNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.n) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.n) : -1); + if (this.tableVo.getSearchFieldNum() == null) { + this.tableVo.setSearchFieldNum(StringUtils.isNotEmpty(com.jero.codegenerate.properties.CodeConfigProperties.n) ? Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.n) : -1); } - if (this.b.getFieldRowNum() == null) { - this.b.setFieldRowNum(Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.p)); + if (this.tableVo.getFieldRowNum() == null) { + this.tableVo.setFieldRowNum(Integer.parseInt(com.jero.codegenerate.properties.CodeConfigProperties.p)); } - var1.put("tableVo", this.b); + var1.put("tableVo", this.tableVo); try { - if (this.e == null || this.e.size() == 0) { - this.e = DbReadTableUtil.listOneColumnVo(this.b.getTableName()); + if (this.columns == null || this.columns.size() == 0) { + this.columns = DbReadTableUtil.listColumns(this.tableVo.getTableName()); } - var1.put("columns", this.e); - if (this.f == null || this.f.size() == 0) { - this.f = DbReadTableUtil.listOneToManyColumnVo(this.b.getTableName()); + var1.put("columns", this.columns); + if (this.originalColumns == null || this.originalColumns.size() == 0) { + this.originalColumns = DbReadTableUtil.listOriginalColumns(this.tableVo.getTableName()); } - var1.put("originalColumns", this.f); - Iterator var2 = this.f.iterator(); + var1.put("originalColumns", this.originalColumns); + Iterator iterator = this.originalColumns.iterator(); - while(var2.hasNext()) { - ColumnVo var3 = (ColumnVo)var2.next(); + while(iterator.hasNext()) { + ColumnVo var3 = (ColumnVo)iterator.next(); if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { var1.put("primaryKeyPolicy", var3.getFieldType()); } @@ -82,7 +82,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { } public List generateCodeFile(String stylePath) throws Exception { - log.debug("----jero---Code----Generation----[单表模型:" + this.b.getTableName() + "]------- 生成中。。。"); + log.debug("----jero---Code----Generation----[单表模型:" + this.tableVo.getTableName() + "]------- 生成中。。。"); String var2 = com.jero.codegenerate.properties.CodeConfigProperties.f; Map var3 = this.a(); String var4 = com.jero.codegenerate.properties.CodeConfigProperties.templateUrl; @@ -94,7 +94,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { CreateFileConfig var5 = new CreateFileConfig(var4); var5.setStylePath(stylePath); this.a(var5, var2, var3); - log.info(" ----- jero-boot ---- generate code success =======> 表名：" + this.b.getTableName() + " "); + log.info(" ----- jero-boot ---- generate code success =======> 表名：" + this.tableVo.getTableName() + " "); return this.d; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java index a74eb295..0e62da09 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java @@ -64,11 +64,11 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate try { if (this.h == null || this.h.size() == 0) { - this.h = DbReadTableUtil.listOneColumnVo(this.mainTableVo.getTableName()); + this.h = DbReadTableUtil.listColumns(this.mainTableVo.getTableName()); } if (this.i == null || this.i.size() == 0) { - this.i = DbReadTableUtil.listOneToManyColumnVo(this.mainTableVo.getTableName()); + this.i = DbReadTableUtil.listOriginalColumns(this.mainTableVo.getTableName()); } var1.put("columns", this.h); @@ -88,12 +88,12 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate SubTableVo var12 = (SubTableVo)var2.next(); List var4; if (var12.getColums() == null || var12.getColums().size() == 0) { - var4 = DbReadTableUtil.listOneColumnVo(var12.getTableName()); + var4 = DbReadTableUtil.listColumns(var12.getTableName()); var12.setColums(var4); } if (var12.getOriginalColumns() == null || var12.getOriginalColumns().size() == 0) { - var4 = DbReadTableUtil.listOneToManyColumnVo(var12.getTableName()); + var4 = DbReadTableUtil.listOriginalColumns(var12.getTableName()); var12.setOriginalColumns(var4); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index 6e7f8d0c..0290976f 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -503,7 +503,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl