commit udpate

许鹏程

2024-08-15 df81fa08540b7cc71e1facf50e24c395f089037c

commit udpate

 src/main/java/com/product/data/sync/controller/ConnectionConfigurationController.java

@@ -76,9 +76,11 @@
            SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getValue(), SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getText());
            return error(SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getValue(), SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getText());
        }catch(BaseException e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(e);
        }catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getValue(), SystemCode.SYSTEM_SAVE_CONNECT_CONFIGURE_FAIL.getText());
        }

 src/main/java/com/product/data/sync/service/ConnectionConfigurationService.java

@@ -221,22 +221,22 @@
            if (!BaseUtil.strIsNull(condition)) {
                condition = " AND TABLE_NAME " + condition;
            }
            sql = "select TABLE_NAME from information_schema.COLUMNS WHERE TABLE_SCHEMA = '" + fs.getString(CmnConst.DATABASE_NAME) + "' " + condition + " GROUP BY TABLE_NAME";
            sql = "select TABLE_NAME from information_schema.COLUMNS WHERE TABLE_SCHEMA = '" + fs.getString(CmnConst.DATABASE_NAME) + "' " + (condition == null ? "" : condition) + " GROUP BY TABLE_NAME";
        } else if ("oracle".equals(databaseType)) {                                //用户名 分大小写
            if (!BaseUtil.strIsNull(condition)) {
                condition = " AND TABLE_NAME " + condition;
            }
            sql = "select TABLE_NAME from all_tab_columns WHERE OWNER = '" + fs.getString(CmnConst.USER_NAME) + "' " + condition + " GROUP BY TABLE_NAME ";
            sql = "select TABLE_NAME from all_tab_columns WHERE OWNER = '" + fs.getString(CmnConst.USER_NAME) + "' " + (condition == null ? "" : condition) + " GROUP BY TABLE_NAME ";
        } else if ("sqlserver".equals(databaseType)) {                            //数据库名称
            if (!BaseUtil.strIsNull(condition)) {
                condition = " AND name" + condition;
            }
            sql = "SELECT name TABLE_NAME FROM " + fs.getString(CmnConst.DATABASE_NAME) + "..SysObjects Where XType='U' " + condition;
            sql = "SELECT name TABLE_NAME FROM " + fs.getString(CmnConst.DATABASE_NAME) + "..SysObjects Where XType='U' " + (condition == null ? "" : condition);
        } else if ("informix".equals(databaseType)) {                            //数据库名称
            if (!BaseUtil.strIsNull(condition)) {
                condition = " AND tabname " + condition;
            }
            sql = "SELECT tabname TABLE_NAME FROM \"informix\".systables WHERE tabtype = 'T' AND tabid >= 100 " + condition;
            sql = "SELECT tabname TABLE_NAME FROM \"informix\".systables WHERE tabtype = 'T' AND tabid >= 100 " + (condition == null ? "" : condition);
        } else {
            throw new BaseException(SystemCode.SYSTEM_UNKNOWN_DATABASE_TYPE.getValue(), SystemCode.SYSTEM_UNKNOWN_DATABASE_TYPE.getText());
        }