From 364c2032981175bdd5939b27ed99203bb7cb73d0 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:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91DbTableMysqlHandle?= =?UTF-8?q?Impl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/a/DbTableMysqlHandleImpl.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableMysqlHandleImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableMysqlHandleImpl.java index df952799..2d8bc6d1 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableMysqlHandleImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/config/service/a/DbTableMysqlHandleImpl.java @@ -1,10 +1,15 @@ package com.jero.generater.modules.online.config.service.a; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import com.jero.generater.modules.online.config.util.ColumnMeta; import com.jero.generater.modules.online.config.service.DbTableHandleI; +import org.jetbrains.annotations.NotNull; +import java.util.Objects; + +@Slf4j public class DbTableMysqlHandleImpl implements DbTableHandleI { private static final String DOUBLE = "double"; @@ -57,31 +62,38 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI { private String a(ColumnMeta var1, ColumnMeta var2) { String var3 = ""; if (var1.getColunmType().equalsIgnoreCase("string")) { - var3 = var1.getColumnName() + " varchar(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " varchar(" + var1.getColumnSize() + ") " + getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL); } else if (var1.getColunmType().equalsIgnoreCase("date")) { - var3 = var1.getColumnName() + " datetime " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " datetime " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } else if (var1.getColunmType().equalsIgnoreCase("int")) { - var3 = var1.getColumnName() + " int(" + var1.getColumnSize() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " int(" + var1.getColumnSize() + ") " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } else if (var1.getColunmType().equalsIgnoreCase(DOUBLE)) { - var3 = var1.getColumnName() + " double(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " double(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } else if (var1.getColunmType().equalsIgnoreCase("bigdecimal")) { - var3 = var1.getColumnName() + " decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " decimal(" + var1.getColumnSize() + "," + var1.getDecimalDigits() + ") " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } else if (var1.getColunmType().equalsIgnoreCase("text")) { - var3 = var1.getColumnName() + " text " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " text " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } else if (var1.getColunmType().equalsIgnoreCase("blob")) { - var3 = var1.getColumnName() + " blob " + ("Y".equals(var1.getIsNullable()) ? "NULL" : NOT_NULL); + var3 = var1.getColumnName() + " blob " + (getString("Y".equals(var1.getIsNullable()), "NULL", NOT_NULL)); } var3 = var3 + (StringUtils.isNotEmpty(var1.getComment()) ? " COMMENT '" + var1.getComment() + "'" : " "); - var3 = var3 + (StringUtils.isNotEmpty(var1.getFieldDefault()) ? " DEFAULT " + var1.getFieldDefault() : " "); + var3 = var3 + (getString(StringUtils.isNotEmpty(var1.getFieldDefault()), " DEFAULT " + var1.getFieldDefault(), " ")); String var4 = var1.getPkType(); if ("id".equalsIgnoreCase(var1.getColumnName()) && var4 != null && ("SEQUENCE".equalsIgnoreCase(var4) || "NATIVE".equalsIgnoreCase(var4))) { var3 = var3 + " AUTO_INCREMENT "; } - + if(!Objects.isNull(var2)){ + log.info("参数未使用"); + } return var3; } + @NotNull + private String getString(boolean equals, String aNull, String notNull) { + return equals ? aNull : notNull; + } + private String b(ColumnMeta var1, ColumnMeta var2) { return this.a(var1, var2); }