KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】config文件夹

Browse Source
This commit is contained in:
梁琦涛
2023-03-14 14:05:28 +08:00
parent f298061f25
commit 6a4c5de717
2 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/DbTableProcess.java
+23 -30
View File
@@ -46,7 +46,7 @@ public class DbTableProcess {
public static void a(CgformConfigModel var0) throws IOException, TemplateException, HibernateException, SQLException, DBException {
String var1 = DbTableUtil.getDatabaseType();
if (ORACLE.equals(var1)) {
ArrayList var2 = Lists.newArrayList();
ArrayList<OnlCgformField> var2 = Lists.newArrayList();
OnlCgformField var4;
for(Iterator var3 = var0.getColumns().iterator(); var3.hasNext(); var2.add(var4)) {
@@ -97,12 +97,11 @@ public class DbTableProcess {
var9.create(EnumSet.of(TargetType.DATABASE), var8);
var7.close();
List var10 = var9.getExceptions();
Iterator var11 = var10.iterator();
while(var11.hasNext()) {
Exception var12 = (Exception)var11.next();
if (Objects.equals(var12.getCause().getClass().getName(),"java.sql.SQLSyntaxErrorException")) {
SQLSyntaxErrorException var13 = (SQLSyntaxErrorException)var12.getCause();
for (Object o : var10) {
Exception var12 = (Exception) o;
if (Objects.equals(var12.getCause().getClass().getName(), "java.sql.SQLSyntaxErrorException")) {
SQLSyntaxErrorException var13 = (SQLSyntaxErrorException) var12.getCause();
if ("42000".equals(var13.getSQLState())) {
if (1064 != var13.getErrorCode() && 903 != var13.getErrorCode()) {
continue;
@@ -110,8 +109,8 @@ public class DbTableProcess {
throw new DBException("请确认表名是否为关键字。");
}
} else if (Objects.equals("com.microsoft.sqlserver.jdbc.SQLServerException",var12.getCause().getClass().getName())) {
if (var12.getCause().toString().indexOf("Incorrect syntax near the keyword") != -1) {
} else if (Objects.equals("com.microsoft.sqlserver.jdbc.SQLServerException", var12.getCause().getClass().getName())) {
if (var12.getCause().toString().contains("Incorrect syntax near the keyword")) {
var12.printStackTrace();
throw new DBException(var12.getCause().getMessage());
}
@@ -129,12 +128,12 @@ public class DbTableProcess {
String var2 = DbTableUtil.getDatabaseType();
String var3 = DbTableUtil.a(var1.getTableName(), var2);
String var4 = "alter table " + var3 + " ";
ArrayList var5 = new ArrayList<>();
ArrayList<String> var5 = new ArrayList<>();
try {
Map var6 = this.c((String)null, var3);
Map var7 = this.c(var1);
Map var8 = this.a(var1.getColumns());
Map<String, ColumnMeta> var6 = this.c(null, var3);
Map<String, ColumnMeta> var7 = this.c(var1);
Map<String, String> var8 = this.a(var1.getColumns());
Iterator var9 = var7.keySet().iterator();
label72:
@@ -145,10 +144,10 @@ public class DbTableProcess {
var10 = (String)var9.next();
ColumnMeta var11;
if (!var6.containsKey(var10)) {
var11 = (ColumnMeta)var7.get(var10);
String var17 = (String)var8.get(var10);
var11 = var7.get(var10);
String var17 = var8.get(var10);
if (var8.containsKey(var10) && var6.containsKey(var17)) {
ColumnMeta var13 = (ColumnMeta)var6.get(var17);
ColumnMeta var13 = var6.get(var17);
String var14 = c.getReNameFieldName(var11);
if (SQL_SERVER.equals(var2)) {
var5.add(var14);
@@ -175,8 +174,8 @@ public class DbTableProcess {
}
}
} else {
var11 = (ColumnMeta)var6.get(var10);
ColumnMeta var12 = (ColumnMeta)var7.get(var10);
var11 = var6.get(var10);
ColumnMeta var12 = var7.get(var10);
if (!var11.a(var12, var2)) {
var5.add(var4 + this.a(var12, var11));
}
@@ -207,11 +206,9 @@ public class DbTableProcess {
}
private static Map<String, Object> a(CgformConfigModel var0, String var1) {
HashMap var2 = new HashMap();
Iterator var3 = var0.getColumns().iterator();
HashMap var2 = new HashMap<>();
while(var3.hasNext()) {
OnlCgformField var4 = (OnlCgformField)var3.next();
for (OnlCgformField var4 : var0.getColumns()) {
var4.setDbDefaultVal(c(var4.getDbDefaultVal()));
}
@@ -221,7 +218,7 @@ public class DbTableProcess {
}
private Map<String, ColumnMeta> c(String var1, String var2) throws SQLException {
HashMap var3 = new HashMap();
HashMap var3 = new HashMap<>();
Connection var4 = null;
try {
@@ -280,11 +277,9 @@ public class DbTableProcess {
private Map<String, ColumnMeta> c(CgformConfigModel var1) {
HashMap var2 = new HashMap<>();
List var3 = var1.getColumns();
Iterator var5 = var3.iterator();
List<OnlCgformField> var3 = var1.getColumns();
while(var5.hasNext()) {
OnlCgformField var6 = (OnlCgformField)var5.next();
for (OnlCgformField var6 : var3) {
ColumnMeta var4 = new ColumnMeta();
var4.setTableName(var1.getTableName().toLowerCase());
var4.setColumnId(var6.getId());
@@ -306,10 +301,8 @@ public class DbTableProcess {
private Map<String, String> a(List<OnlCgformField> var1) {
HashMap var2 = new HashMap<>();
Iterator var3 = var1.iterator();
while(var3.hasNext()) {
OnlCgformField var4 = (OnlCgformField)var3.next();
for (OnlCgformField var4 : var1) {
var2.put(var4.getDbFieldName(), var4.getDbFieldNameOld());
}
@@ -373,7 +366,7 @@ public class DbTableProcess {
public static List<String> a(String var0) throws SQLException {
Connection var1 = null;
ResultSet var2 = null;
ArrayList var3 = new ArrayList<>();
ArrayList<String> var3 = new ArrayList<>();
try {
var1 = DbTableUtil.getConnection();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/ExtendJsonConvert.java
+2 -3
View File
@@ -13,10 +13,9 @@ public class ExtendJsonConvert {
private static String a(String var0, int var1) {
String var2 = var0;
Iterator var3 = a.keySet().iterator();
while(var3.hasNext()) {
String var4 = String.valueOf(var3.next());
for (String s : a.keySet()) {
String var4 = String.valueOf(s);
String var5 = String.valueOf(a.get(var4));
if (var1 == 1) {
var2 = var0.replaceAll(var4, var5);