JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】对方法和局部变量重新命名

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