From 6536f0dfe22fd35e91be3aaf71192eafe60f2ff7 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:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91DbTableSQLServerHa?= =?UTF-8?q?ndleImpl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/a/DbTableSQLServerHandleImpl.java | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableSQLServerHandleImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableSQLServerHandleImpl.java index dd3f69ee..53645f23 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableSQLServerHandleImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableSQLServerHandleImpl.java @@ -4,7 +4,12 @@ package com.jero.generater.modules.online.config.service.a; import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.config.util.ColumnMeta; import com.jero.generater.modules.online.config.service.DbTableHandleI; +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import java.util.Objects; + +@Slf4j public class DbTableSQLServerHandleImpl implements DbTableHandleI { private static final String STRING = "string"; @@ -33,29 +38,35 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI { public String getMatchClassTypeByDataType(String dataType, int digits) { String var3 = ""; if (!dataType.equalsIgnoreCase("varchar") && !dataType.equalsIgnoreCase("nvarchar")) { - if (dataType.equalsIgnoreCase("float")) { - var3 = DOUBLE; - } else if (dataType.equalsIgnoreCase("int")) { - var3 = "int"; - } else if (dataType.equalsIgnoreCase("Date")) { - var3 = "date"; - } else if (dataType.equalsIgnoreCase("Datetime")) { - var3 = "date"; - } else if (dataType.equalsIgnoreCase("numeric")) { - var3 = BIG_DECIMAL; - } else if (!dataType.equalsIgnoreCase("varbinary") && !dataType.equalsIgnoreCase("image")) { - if (dataType.equalsIgnoreCase("text") || dataType.equalsIgnoreCase("ntext")) { - var3 = "text"; - } - } else { - var3 = "blob"; - } + var3 = getString(dataType, var3); } else { var3 = STRING; } return var3; } + + private String getString(String dataType, String var3) { + if (dataType.equalsIgnoreCase("float")) { + var3 = DOUBLE; + } else if (dataType.equalsIgnoreCase("int")) { + var3 = "int"; + } else if (dataType.equalsIgnoreCase("Date")) { + var3 = "date"; + } else if (dataType.equalsIgnoreCase("Datetime")) { + var3 = "date"; + } else if (dataType.equalsIgnoreCase("numeric")) { + var3 = BIG_DECIMAL; + } else if (!dataType.equalsIgnoreCase("varbinary") && !dataType.equalsIgnoreCase("image")) { + if (dataType.equalsIgnoreCase("text") || dataType.equalsIgnoreCase("ntext")) { + var3 = "text"; + } + } else { + var3 = "blob"; + } + return var3; + } + @Override public String dropTableSQL(String tableName) { return " DROP TABLE " + tableName + " ;"; @@ -68,38 +79,46 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI { private String a(ColumnMeta var1, ColumnMeta var2) { String var3 = ""; if (var1.getColunmType().equalsIgnoreCase(STRING)) { - var3 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("date")) { - var3 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + DATE_TIME + getString(var1); } else if (var1.getColunmType().equalsIgnoreCase("int")) { - var3 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + INT + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) { - var3 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + FLOAT + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL)) { - var3 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("text")) { - var3 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " ntext " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("blob")) { var3 = var1.getColumnName() + " image"; } + if(!Objects.isNull(var2)){ + log.info("参数未使用"); + } return var3; } + @NotNull + private String getString(ColumnMeta var1) { + return "Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL; + } + private String a(ColumnMeta var1) { String var2 = ""; if (var1.getColunmType().equalsIgnoreCase(STRING)) { - var2 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("date")) { - var2 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + DATE_TIME + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("int")) { - var2 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + INT + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) { - var2 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + FLOAT + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase(BIG_DECIMAL)) { - var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + " numeric(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("text")) { - var2 = var1.getColumnName() + " ntext " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var2 = var1.getColumnName() + " ntext " + (getString(var1)); } else if (var1.getColunmType().equalsIgnoreCase("blob")) { var2 = var1.getColumnName() + " image"; } @@ -107,20 +126,6 @@ public class DbTableSQLServerHandleImpl implements DbTableHandleI { return var2; } - private String b(ColumnMeta var1) { - String var2 = ""; - if (var1.getColunmType().equalsIgnoreCase(STRING)) { - var2 = var1.getColumnName() + NVARCHAR + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); - } else if (var1.getColunmType().equalsIgnoreCase("date")) { - var2 = var1.getColumnName() + DATE_TIME + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); - } else if (var1.getColunmType().equalsIgnoreCase("int")) { - var2 = var1.getColumnName() + INT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); - } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) { - var2 = var1.getColumnName() + FLOAT + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); - } - - return var2; - } @Override public String getCommentSql(ColumnMeta columnMeta) { StringBuilder var2 = new StringBuilder("EXECUTE ");