- oracle等默认表字段大写的数据增加表名称大小写配置，避免大小写表明一起查

- mybatis-orm-support开关优化，当alphahub.dtt.is-enable=false时mybatis-orm-support设置为禁用

Author: Weasley

README.md

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.3</version>
+        <version>2.7.5</version>
         <!--<version>2.3.12.RELEASE</version>-->
         <relativePath/>
     </parent>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>io.github.weasley-j</groupId>
             <artifactId>dtt-spring-boot-starter</artifactId>
-            <version>1.3.5</version>
+            <version>1.3.6</version>
         </dependency>
         <!-- javadoc-scribe start  -->
         <dependency>

doc/todo.md

@@ -0,0 +1,52 @@
+package com.example.domain.dtt;
+
+import cn.alphahub.dtt.plus.annotations.Dtt;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author ruoyi
+ */
+@Data
+@Dtt("参数配置表")
+public class SysConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数主键
+     */
+    //@Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    @Dtt(primaryKey = true, value = "参数主键")
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    //@Excel(name = "参数名称")
+    @Dtt("参数名称")
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    //@Excel(name = "参数键名")
+    @Dtt("参数键名")
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    //@Excel(name = "参数键值")
+    @Dtt("参数键值")
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    //@Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+    @Dtt("系统内置")
+    private String configType;
+}

dtt-spring-boot-starter-tests/dtt-spring-boot-2-x/pom.xml

@@ -7,7 +7,7 @@ logging:
 spring:
   datasource:
     driver-class-name: com.ibm.db2.jcc.DB2Driver
-    url: jdbc:db2://192.168.31.23:50000/testdb
+    url: jdbc:db2://localhost:50000/testdb
     username: weasley
     password: 123456
 

dtt-spring-boot-starter-tests/dtt-spring-boot-2-x/src/main/java/com/example/domain/dtt/SysConfig.java

@@ -6,7 +6,7 @@ logging:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.31.23:3306/db_demo?serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://10.211.55.3:3306/db_demo?serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: 123456
 

dtt-spring-boot-starter-tests/dtt-spring-boot-2-x/src/main/resources/application-db2.yml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.github.weasley-j</groupId>
             <artifactId>dtt-spring-boot-starter</artifactId>
-            <version>1.3.5</version>
+            <version>1.3.6</version>
         </dependency>
         <!-- javadoc-scribe start  -->
         <dependency>

dtt-spring-boot-starter-tests/dtt-spring-boot-2-x/src/main/resources/application-mysql.yml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.3</version>
+        <version>2.7.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>io.github.weasley-j</groupId>
     <artifactId>dtt-spring-boot-starter</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <name>dtt-spring-boot-starter</name>
     <description>
         DTT is an object-oriented Java framework that helps developers increase productivity, Domain driven table is the
@@ -49,20 +49,21 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <hutool.version>5.8.5</hutool.version>
+        <hutool.version>5.8.10</hutool.version>
         <commons-io.version>2.11.0</commons-io.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
         <velocity-engine-core.version>2.3</velocity-engine-core.version>
         <mybatis-spring.version>2.0.7</mybatis-spring.version>
-        <mybatis.version>3.5.10</mybatis.version>
+        <mybatis.version>3.5.11</mybatis.version>
         <jsqlparser.version>4.5</jsqlparser.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
         <!-- deploy start -->
         <nexus-staging.version>1.6.13</nexus-staging.version>
         <maven-javadoc.version>3.4.0</maven-javadoc.version>
         <maven-gpg.version>3.0.1</maven-gpg.version>
         <!-- deploy end -->
+        <snakeyaml.version>1.33</snakeyaml.version>
     </properties>
 
     <dependencies>
@@ -89,9 +90,20 @@
             <optional>true</optional>
         </dependency>
         <!-- spring boot starter -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--lombok-->
         <dependency>

dtt-spring-boot-starter-tests/dtt-spring-boot-3-x/pom.xml

@@ -1,6 +1,5 @@
 package cn.alphahub.dtt.plus.annotations;
 
-import javax.validation.Constraint;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -50,7 +49,7 @@
      * The constraints condition for model of table.
      *
      * @return constraints condition
-     * @apiNote It is recommended enabling this property on Class to describe constraints information for the table
+     * @apiNote It is recommended enabling this property on Class to describe constraints information for tables
      * @see Index
      * @see UniqueKey
      */

dtt-spring-boot-starter/pom.xml

@@ -101,6 +101,7 @@ public DttMybatisAutoConfiguration(JdbcTemplate jdbcTemplate,
 
     @Override
     public void afterPropertiesSet() {
+        if (dttProperties.getIsEnable().equals(false)) return;
         if (dttMybatisOrmSupportProperties.getIsEnable().equals(false)) return;
         this.shardingSphereEnable = isShardingSphereEnable();
         sqlSessionFactories.forEach(sqlSessionFactory -> {
@@ -197,44 +198,22 @@ public boolean isTableNotExists(String tableName) {
      * @return sql scripts
      */
     public List<String> getQueryTableExistsSqlScripts(String tableName, DatabaseType databaseType) {
-        List<String> sqlScripts = new ArrayList<>(4);
         Map<DatabaseType, TableExistsSqlMapperProperties> propertiesMap = dttProperties.getTableExistsSqlMapper();
         TableExistsSqlMapperProperties rawSql = propertiesMap.get(databaseType);
         if (null == rawSql) return Collections.emptyList();
 
-        String lcts = StringUtils.defaultIfBlank(rawSql.getScriptOfLowerCaseTableName(), "");
-        String usts = StringUtils.defaultIfBlank(rawSql.getScriptOfUpperCaseTableName(), "");
-        String dbNamePlaceHolder = "${databaseName}";
+        String realTableName = tableName;
+        List<String> scripts = new ArrayList<>(4);
 
-        switch (databaseType) {
-            case MYSQL:
-            case MARIADB:
-            case SQLSERVER:
-            case POSTGRESQL:
-                lcts = lcts.replace("${lowerCaseTableName}", tableName);
-                if (lcts.contains(dbNamePlaceHolder)) {
-                    lcts = lcts.replace(dbNamePlaceHolder, databaseProperty.getDatabaseName());
-                }
-                sqlScripts.add(lcts);
-                return sqlScripts;
-            case H2:
-            case DB2:
-            case ORACLE:
-            case DERBY:
-            case HSQL:
-                usts = usts.replace("${upperCaseTableName}", tableName.toUpperCase());
-                if (usts.contains(dbNamePlaceHolder))
-                    usts = usts.replace(dbNamePlaceHolder, databaseProperty.getDatabaseName());
-                sqlScripts.add(usts);
-
-                lcts = lcts.replace("${lowerCaseTableName}", tableName);
-                if (lcts.contains(dbNamePlaceHolder))
-                    lcts = lcts.replace(dbNamePlaceHolder, databaseProperty.getDatabaseName());
-                sqlScripts.add(lcts);
+        if (rawSql.getTablenameUppercase().equals(true)) realTableName = tableName.toUpperCase();
+        String realScript = StringUtils.defaultIfBlank(rawSql.getScriptForTableExists(), "");
 
-                return sqlScripts;
-            default:
-                return sqlScripts;
+        realScript = realScript.replace("${tablename}", realTableName);
+        if (realScript.contains("${dbname}")) {
+            realScript = realScript.replace("${dbname}", databaseProperty.getDatabaseName());
         }
+        scripts.add(realScript);
+
+        return scripts;
     }
 }

dtt-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/annotations/Dtt.java

@@ -483,25 +483,25 @@ public static class PrecisionConfigurationProperties {
     @ConfigurationProperties(prefix = PREFIX + ".table-exists-sql-mapper")
     public static class TableExistsSqlMapperProperties {
         /**
-         * The SQL script to  query the given table whether exists, the table name format(underline),
+         * Optional. Take MySQL an example: If a classname is 'DttMember', When 'tablenameUppercase' set to 'false'.<br/>
+         * The 'scriptForTableExists' will be [SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${databaseName}' AND TABLE_NAME = 'dtt_member'] Otherwise [SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${databaseName}' AND TABLE_NAME = 'DTT_MEMBER']<br>
          * <p>
-         * i.e: dtt_member
+         * i.e: DTT_MEMBER, It's available to set 'tablenameUppercase = true' for getting a tablename with uppercase.
          *
+         * @see DatabaseType#DB2
+         * @see DatabaseType#H2
+         * @see DatabaseType#ORACLE
+         * <p>
+         * i.e: dtt_member
          * @see DatabaseType#MYSQL
          * @see DatabaseType#SQLSERVER
          * @see DatabaseType#MARIADB
          * @see DatabaseType#POSTGRESQL
          */
-        private String scriptOfLowerCaseTableName;
+        private Boolean tablenameUppercase = false;
         /**
-         * The SQL script to  query the given table whether exists, the table name format(underline), Optional.
-         * <p>
-         * i.e: DTT_MEMBER
-         *
-         * @see DatabaseType#DB2
-         * @see DatabaseType#H2
-         * @see DatabaseType#ORACLE
+         * The SQL script to  query the given table whether exists
          */
-        private String scriptOfUpperCaseTableName;
+        private String scriptForTableExists;
     }
 }

dtt-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/config/DttMybatisAutoConfiguration.java

@@ -189,7 +189,7 @@ private List<MyBatisPlusCodeWrapper> getMyBatisPlusCodeWrappers(CodeGeneratorPro
      *
      * @param cgProperties     MyBatis-Plus code generation configuration properties
      * @param codeWrapper      mybatis-plus code wrapper to integrate metadata
-     * @param templateResource A template resource of velocity（'.vm'）
+     * @param templateResource A template resource of velocity '.vm'
      * @return The Absolute Filename Of Source Code
      */
     private String getAbsoluteFilename(CodeGeneratorProperties cgProperties, MyBatisPlusCodeWrapper codeWrapper, String templateResource) {

dtt-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/config/DttProperties.java

@@ -318,25 +318,29 @@ alphahub:
     #The properties of sql-script-mapper to query the given table whether exists
     table-exists-sql-mapper:
       mysql:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${databaseName}' AND TABLE_NAME = '${lowerCaseTableName}'"
+        tablename-uppercase: false
+        script-for-table-exists: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${dbname}' AND TABLE_NAME = '${tablename}'"
       oracle:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM USER_TABLES WHERE TABLE_NAME = '${lowerCaseTableName}'"
-        script-of-upper-case-table-name: "SELECT COUNT(*) FROM USER_TABLES WHERE TABLE_NAME = '${upperCaseTableName}'"
+        tablename-uppercase: true
+        script-for-table-exists: "SELECT COUNT(*) FROM USER_TABLES WHERE TABLE_NAME = '${tablename}'"
       db2:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM syscat.tables WHERE TABNAME = '${lowerCaseTableName}'"
-        script-of-upper-case-table-name: "SELECT COUNT(*) FROM syscat.tables WHERE TABNAME = '${upperCaseTableName}'"
+        tablename-uppercase: true
+        script-for-table-exists: "SELECT COUNT(*) FROM syscat.tables WHERE TABNAME = '${tablename}'"
       sqlserver:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM sys.all_objects WHERE object_id = OBJECT_ID( N'[dbo].[${lowerCaseTableName}]' ) AND type IN ( 'U' )"
+        tablename-uppercase: false
+        script-for-table-exists: "SELECT COUNT(*) FROM sys.all_objects WHERE object_id = OBJECT_ID( N'[dbo].[${tablename}]' ) AND type IN ( 'U' )"
       mariadb:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${databaseName}' AND TABLE_NAME = '${lowerCaseTableName}'"
+        tablename-uppercase: false
+        script-for-table-exists: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${dbname}' AND TABLE_NAME = '${tablename}'"
       postgresql:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM pg_class WHERE relname = '${lowerCaseTableName}'"
+        tablename-uppercase: false
+        script-for-table-exists: "SELECT COUNT(*) FROM pg_class WHERE relname = '${tablename}'"
       h2:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '${lowerCaseTableName}'"
-        script-of-upper-case-table-name: "SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '${upperCaseTableName}'"
+        tablename-uppercase: true
+        script-for-table-exists: "SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '${tablename}'"
       hsql:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '${lowerCaseTableName}'"
-        script-of-upper-case-table-name: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '${upperCaseTableName}'"
+        tablename-uppercase: true
+        script-for-table-exists: "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '${tablename}'"
       derby:
-        script-of-lower-case-table-name: "SELECT COUNT(*) FROM SYS.SYSTABLES WHERE TABLENAME = '${lowerCaseTableName}' AND TABLETYPE = 'T'"
-        script-of-upper-case-table-name: "SELECT COUNT(*) FROM SYS.SYSTABLES WHERE TABLENAME = '${upperCaseTableName}' AND TABLETYPE = 'T'"
+        tablename-uppercase: true
+        script-for-table-exists: "SELECT COUNT(*) FROM SYS.SYSTABLES WHERE TABLENAME = '${tablename}' AND TABLETYPE = 'T'"