♻️ 重构代码

PetalTan · Aug 26, 2020 · cc88d5d · cc88d5d
1 parent bb9bfeb
commit cc88d5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/query/oracle/OracleDataBaseQuery.java b/screw-core/src/main/java/cn/smallbun/screw/core/query/oracle/OracleDataBaseQuery.java
@@ -141,9 +141,9 @@ public List<OracleColumnModel> getTableColumns(String table) throws QueryExcepti
             if (CollectionUtils.isEmpty(columnsCaching)) {
                 //查询全部
                 if (table.equals(PERCENT_SIGN)) {
-                    String sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name";
+                    String sql = "SELECT ut.TABLE_NAME,  ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name";
                     if (isDda()) {
-                        sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.OWNER = '"
+                        sql = "SELECT ut.TABLE_NAME,  ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.OWNER = '"
                               + getDataBase() + "'";
                     }
                     PreparedStatement statement = prepareStatement(sql);
@@ -155,9 +155,9 @@ public List<OracleColumnModel> getTableColumns(String table) throws QueryExcepti
                 }
                 //单表查询
                 else {
-                    String sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name WHERE ut.Table_Name = '%s'";
+                    String sql = "SELECT ut.TABLE_NAME,  ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM user_tab_columns ut INNER JOIN user_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name WHERE ut.Table_Name = '%s'";
                     if (isDda()) {
-                        sql = "SELECT ut.TABLE_NAME, -- 表名称 ut.COLUMN_NAME,--字段名称 uc.comments as REMARKS,--字段注释 concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE,--字典类型 ut.DATA_LENGTH as COLUMN_LENGTH--字典长度 FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.Table_Name = '%s' ut.OWNER = '"
+                        sql = "SELECT ut.TABLE_NAME,  ut.COLUMN_NAME, uc.comments as REMARKS, concat(concat(concat(ut.DATA_TYPE, '('), ut.DATA_LENGTH), ')') AS COLUMN_TYPE, ut.DATA_LENGTH as COLUMN_LENGTH FROM dba_tab_columns ut INNER JOIN dba_col_comments uc ON ut.TABLE_NAME = uc.table_name AND ut.COLUMN_NAME = uc.column_name and ut.OWNER = uc.OWNER WHERE ut.Table_Name = '%s' ut.OWNER = '"
                               + getDataBase() + "'";
                     }
                     resultSet = prepareStatement(String.format(sql, table)).executeQuery();

diff --git a/screw-core/src/test/java/cn/smallbun/screw/core/produce/OracleDocumentationBuilderTest.java b/screw-core/src/test/java/cn/smallbun/screw/core/produce/OracleDocumentationBuilderTest.java
@@ -49,7 +49,6 @@ void build() throws IOException {
         hikariConfig.setJdbcUrl(getUrl());
         hikariConfig.setUsername(getUserName());
         hikariConfig.setPassword(getPassword());
-        //   hikariConfig.addDataSourceProperty("remarks", "true");
         hikariConfig.setMinimumIdle(2);
         hikariConfig.setMaximumPoolSize(5);
         HikariDataSource dataSource = new HikariDataSource(hikariConfig);
@@ -58,7 +57,7 @@ void build() throws IOException {
             //生成文件路径
             .fileOutputDir(fileOutputDir)
             //文件类型
-            .fileType(EngineFileType.HTML)
+            .fileType(EngineFileType.WORD)
             //打开文件夹
             .openOutputDir(true)
             //生成模板实现