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 65f48157..0b91529b 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 @@ -269,7 +269,7 @@ public class DbReadTableUtil { columnVo.setScale(TableConvert.isFieldValueBlank(resultSet.getString(5))); columnVo.setCharmaxLength(TableConvert.isFieldValueBlank(resultSet.getString(6))); columnVo.setNullable(TableConvert.getNullable(resultSet.getString(7))); - columnVo.setFieldType(a(resultSet.getString(2).toLowerCase(), columnVo.getPrecision(), columnVo.getScale())); + columnVo.setFieldType(getFieldType(resultSet.getString(2).toLowerCase(), columnVo.getPrecision(), columnVo.getScale())); columnVo.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase())); setupColumnVo(columnVo); columnVo.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo.getFieldName() : resultSet.getString(3)); @@ -294,7 +294,7 @@ public class DbReadTableUtil { columnVo1.setScale(TableConvert.isFieldValueBlank(resultSet.getString(5))); columnVo1.setCharmaxLength(TableConvert.isFieldValueBlank(resultSet.getString(6))); columnVo1.setNullable(TableConvert.getNullable(resultSet.getString(7))); - columnVo1.setFieldType(a(resultSet.getString(2).toLowerCase(), columnVo1.getPrecision(), columnVo1.getScale())); + columnVo1.setFieldType(getFieldType(resultSet.getString(2).toLowerCase(), columnVo1.getPrecision(), columnVo1.getScale())); columnVo1.setFieldDbType(convertFieldNameToCamelCase(resultSet.getString(2).toLowerCase())); setupColumnVo(columnVo1); columnVo1.setFiledComment(StringUtils.isBlank(resultSet.getString(3)) ? columnVo1.getFieldName() : resultSet.getString(3)); @@ -387,23 +387,23 @@ public class DbReadTableUtil { return fieldName; } - public static String d(String var0) { - String[] var1 = var0.split("_"); - var0 = ""; - int var2 = 0; + public static String convertForeignKeyToCamelCase(String foreignKey) { + String[] foreignKeyWords = foreignKey.split("_"); + foreignKey = ""; + int i = 0; - for(int var3 = var1.length; var2 < var3; ++var2) { - if (var2 > 0) { - String var4 = var1[var2].toLowerCase(); - var4 = var4.substring(0, 1).toUpperCase() + var4.substring(1, var4.length()); - var0 = var0 + var4; + for(int length = foreignKeyWords.length; i < length; ++i) { + if (i > 0) { + String foreignKeyLowerCase = foreignKeyWords[i].toLowerCase(); + foreignKeyLowerCase = foreignKeyLowerCase.substring(0, 1).toUpperCase() + foreignKeyLowerCase.substring(1, foreignKeyLowerCase.length()); + foreignKey = foreignKey + foreignKeyLowerCase; } else { - var0 = var0 + var1[var2].toLowerCase(); + foreignKey = foreignKey + foreignKeyWords[i].toLowerCase(); } } - var0 = var0.substring(0, 1).toUpperCase() + var0.substring(1); - return var0; + foreignKey = foreignKey.substring(0, 1).toUpperCase() + foreignKey.substring(1); + return foreignKey; } private static void setupColumnVo(ColumnVo columnVo) { @@ -436,39 +436,39 @@ public class DbReadTableUtil { } - private static String a(String var0, String var1, String var2) { - if (var0.contains("char")) { - var0 = "java.lang.String"; - } else if (var0.contains("int")) { - var0 = "java.lang.Integer"; - } else if (var0.contains("float")) { - var0 = "java.lang.Float"; - } else if (var0.contains("double")) { - var0 = "java.lang.Double"; - } else if (var0.contains("number")) { - if (StringUtils.isNotBlank(var2) && Integer.parseInt(var2) > 0) { - var0 = "java.math.BigDecimal"; - } else if (StringUtils.isNotBlank(var1) && Integer.parseInt(var1) > 10) { - var0 = "java.lang.Long"; + private static String getFieldType(String value, String precision, String scale) { + if (value.contains("char")) { + value = "java.lang.String"; + } else if (value.contains("int")) { + value = "java.lang.Integer"; + } else if (value.contains("float")) { + value = "java.lang.Float"; + } else if (value.contains("double")) { + value = "java.lang.Double"; + } else if (value.contains("number")) { + if (StringUtils.isNotBlank(scale) && Integer.parseInt(scale) > 0) { + value = "java.math.BigDecimal"; + } else if (StringUtils.isNotBlank(precision) && Integer.parseInt(precision) > 10) { + value = "java.lang.Long"; } else { - var0 = "java.lang.Integer"; + value = "java.lang.Integer"; } - } else if (var0.contains("decimal")) { - var0 = "java.math.BigDecimal"; - } else if (var0.contains("date")) { - var0 = "java.util.Date"; - } else if (var0.contains("time")) { - var0 = "java.util.Date"; - } else if (var0.contains("blob")) { - var0 = "byte[]"; - } else if (var0.contains("clob")) { - var0 = "java.sql.Clob"; - } else if (var0.contains("numeric")) { - var0 = "java.math.BigDecimal"; + } else if (value.contains("decimal")) { + value = "java.math.BigDecimal"; + } else if (value.contains("date")) { + value = "java.util.Date"; + } else if (value.contains("time")) { + value = "java.util.Date"; + } else if (value.contains("blob")) { + value = "byte[]"; + } else if (value.contains("clob")) { + value = "java.sql.Clob"; + } else if (value.contains("numeric")) { + value = "java.math.BigDecimal"; } else { - var0 = "java.lang.Object"; + value = "java.lang.Object"; } - return var0; + return value; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/IGenerate.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/IGenerate.java index 9af923d0..5be83ac5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/IGenerate.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/IGenerate.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; public interface IGenerate { - Map a() throws Exception; + Map getCodeGenerateConfig() throws Exception; List generateCodeFile(String var1) throws Exception; 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 a59dae77..3a8910c4 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 @@ -31,7 +31,8 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { this.originalColumns = originalColumns; } - public Map a() throws Exception { + @Override + public Map getCodeGenerateConfig() throws Exception { HashMap var1 = new HashMap(); var1.put("bussiPackage", com.jero.codegenerate.properties.CodeConfigProperties.packageName); var1.put("entityPackage", this.tableVo.getEntityPackage()); @@ -75,7 +76,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { throw var4; } - long var5 = NonceUtils.c() + NonceUtils.g(); + long var5 = NonceUtils.getSecureRandomLong() + NonceUtils.getCurrentTimeMillis(); var1.put("serialVersionUID", String.valueOf(var5)); log.info("load template data: " + var1.toString()); return var1; @@ -84,7 +85,7 @@ public class CodeGenerateOne extends BaseCodeGenerate implements IGenerate { public List generateCodeFile(String stylePath) throws Exception { log.debug("----jero---Code----Generation----[单表模型:" + this.tableVo.getTableName() + "]------- 生成中。。。"); String var2 = com.jero.codegenerate.properties.CodeConfigProperties.f; - Map var3 = this.a(); + Map var3 = this.getCodeGenerateConfig(); String var4 = com.jero.codegenerate.properties.CodeConfigProperties.templateUrl; if (a(var4, "/").equals("jero/code-template")) { var4 = "/" + a(var4, "/") + "/one"; 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 45fc38ae..43004414 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 @@ -25,11 +25,11 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate private MainTableVo mainTableVo; private List mainColumns; private List originalMainColumns; - private List j; + private List subTables; private static DbReadTableUtil k = new DbReadTableUtil(); public CodeGenerateOneToMany(MainTableVo mainTableVo, List subTables) { - this.j = subTables; + this.subTables = subTables; this.mainTableVo = mainTableVo; } @@ -37,10 +37,11 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate this.mainTableVo = mainTableVo; this.mainColumns = mainColums; this.originalMainColumns = originalMainColumns; - this.j = subTables; + this.subTables = subTables; } - public Map a() throws Exception { + @Override + public Map getCodeGenerateConfig() throws Exception { HashMap hashMap = new HashMap(); hashMap.put("bussiPackage", com.jero.codegenerate.properties.CodeConfigProperties.packageName); hashMap.put("entityPackage", this.mainTableVo.getEntityPackage()); @@ -76,13 +77,13 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate Iterator iterator = this.originalMainColumns.iterator(); while(iterator.hasNext()) { - ColumnVo var3 = (ColumnVo)iterator.next(); - if (var3.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { - hashMap.put("primaryKeyPolicy", var3.getFieldType()); + ColumnVo columnVo = (ColumnVo)iterator.next(); + if (columnVo.getFieldName().toLowerCase().equals(com.jero.codegenerate.properties.CodeConfigProperties.dbTableId.toLowerCase())) { + hashMap.put("primaryKeyPolicy", columnVo.getFieldType()); } } - iterator = this.j.iterator(); + iterator = this.subTables.iterator(); while(iterator.hasNext()) { SubTableVo subTableVo = (SubTableVo)iterator.next(); @@ -97,34 +98,34 @@ public class CodeGenerateOneToMany extends BaseCodeGenerate implements IGenerate subTableVo.setOriginalColumns(originalColumns); } - String[] var13 = subTableVo.getForeignKeys(); - ArrayList var5 = new ArrayList(); - String[] var6 = var13; - int var7 = var13.length; + String[] foreignKeys = subTableVo.getForeignKeys(); + ArrayList list = new ArrayList(); + String[] foreignKeys1 = foreignKeys; + int length = foreignKeys.length; - for(int var8 = 0; var8 < var7; ++var8) { - String var9 = var6[var8]; - var5.add(DbReadTableUtil.d(var9)); + for(int i = 0; i < length; ++i) { + String foreignKey = foreignKeys1[i]; + list.add(DbReadTableUtil.convertForeignKeyToCamelCase(foreignKey)); } - subTableVo.setForeignKeys((String[])var5.toArray(new String[0])); - subTableVo.setOriginalForeignKeys(var13); + subTableVo.setForeignKeys((String[])list.toArray(new String[0])); + subTableVo.setOriginalForeignKeys(foreignKeys); } - hashMap.put("subTables", this.j); - } catch (Exception var10) { - throw var10; + hashMap.put("subTables", this.subTables); + } catch (Exception e) { + throw e; } - long var11 = NonceUtils.c() + NonceUtils.g(); - hashMap.put("serialVersionUID", String.valueOf(var11)); + long serialVersionUID = NonceUtils.getSecureRandomLong() + NonceUtils.getCurrentTimeMillis(); + hashMap.put("serialVersionUID", String.valueOf(serialVersionUID)); log.info("code template data: " + hashMap.toString()); return hashMap; } public List generateCodeFile(String stylePath) throws Exception { String var2 = com.jero.codegenerate.properties.CodeConfigProperties.f; - Map var3 = this.a(); + Map var3 = this.getCodeGenerateConfig(); String var4 = com.jero.codegenerate.properties.CodeConfigProperties.templateUrl; if (a(var4, "/").equals("jero/code-template")) { var4 = "/" + a(var4, "/") + "/onetomany"; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/NonceUtils.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/NonceUtils.java index f4ac3846..36b5f904 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/NonceUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/NonceUtils.java @@ -28,12 +28,12 @@ public class NonceUtils { return Integer.toHexString(a()); } - public static long c() { + public static long getSecureRandomLong() { return (new SecureRandom()).nextLong(); } public static String d() { - return Long.toHexString(c()); + return Long.toHexString(getSecureRandomLong()); } public static String e() { @@ -45,12 +45,12 @@ public class NonceUtils { return a.format(var0); } - public static long g() { + public static long getCurrentTimeMillis() { return System.currentTimeMillis(); } public static String h() { - return Long.toHexString(g()); + return Long.toHexString(getCurrentTimeMillis()); } public static synchronized String i() { @@ -84,6 +84,6 @@ public class NonceUtils { } public static void main(String[] args) throws IOException { - System.out.println(c() + g()); + System.out.println(getSecureRandomLong() + getCurrentTimeMillis()); } }