From 8e828bba4e46f2546dfa4ce58a98265eb07318bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 31 Mar 2023 13:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91ColumnMeta?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../online/config/util/ColumnMeta.java | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/ColumnMeta.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/ColumnMeta.java index ef07d556..9acdc5a1 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/ColumnMeta.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/util/ColumnMeta.java @@ -39,23 +39,11 @@ public class ColumnMeta { } else { ColumnMeta var3 = (ColumnMeta)var1; if ("SQLSERVER".equals(var2)) { - if (!this.e.contains("date") && !this.e.contains("blob") && !this.e.contains("text")) { - return this.e.equals(var3.getColunmType()) && this.i.equals(var3.i) && this.d == var3.getColumnSize() && this.a(this.g, var3.getFieldDefault()); - } else { - return this.c.equals(var3.getColumnName()) && this.i.equals(var3.i); - } + return getSql(var3); } else if ("POSTGRESQL".equals(var2)) { - if (!this.e.contains("date") && !this.e.contains("blob") && !this.e.contains("text")) { - return this.e.equals(var3.getColunmType()) && this.i.equals(var3.i) && this.d == var3.getColumnSize() && this.a(this.g, var3.getFieldDefault()); - } else { - return this.c.equals(var3.getColumnName()) && this.i.equals(var3.i); - } + return getSql(var3); } else if ("ORACLE".equals(var2)) { - if (!this.e.contains("date") && !this.e.contains("blob") && !this.e.contains("text")) { - return this.e.equals(var3.getColunmType()) && this.i.equals(var3.i) && this.d == var3.getColumnSize() && this.a(this.g, var3.getFieldDefault()); - } else { - return this.c.equals(var3.getColumnName()) && this.i.equals(var3.i); - } + return getSql(var3); } else if (!this.e.contains("date") && !this.e.contains("blob") && !this.e.contains("text")) { return this.e.equals(var3.getColunmType()) && this.i.equals(var3.i) && this.d == var3.getColumnSize() && this.a(this.f, var3.getComment()) && this.a(this.g, var3.getFieldDefault()); } else { @@ -64,12 +52,20 @@ public class ColumnMeta { } } + private boolean getSql(ColumnMeta var3) { + if (!this.e.contains("date") && !this.e.contains("blob") && !this.e.contains("text")) { + return this.e.equals(var3.getColunmType()) && this.i.equals(var3.i) && this.d == var3.getColumnSize() && this.a(this.g, var3.getFieldDefault()); + } else { + return this.c.equals(var3.getColumnName()) && this.i.equals(var3.i); + } + } + public boolean a(ColumnMeta var1) { - return var1 == this ? true : this.a(this.f, var1.getComment()); + return var1 == this || this.a(this.f, var1.getComment()); } public boolean b(ColumnMeta var1) { - return var1 == this ? true : this.a(this.f, var1.getComment()); + return var1 == this || this.a(this.f, var1.getComment()); } private boolean a(String var1, String var2) { @@ -78,7 +74,7 @@ public class ColumnMeta { if (var3 != var4) { return false; } else { - return var3 ? var1.equals(var2) : true; + return !var3 || var1.equals(var2); } }