diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/constant/SqlReadConstant.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/constant/SqlReadConstant.java index 5351be539..50dd26531 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/constant/SqlReadConstant.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/constant/SqlReadConstant.java @@ -12,7 +12,7 @@ public class SqlReadConstant { public static final String SQL_PATTERN = "SELECT * FROM {} WHERE {}=?"; - public static final String SQL_PATTERN_WITH_SUFFIX = "SELECT * FROM {} WHERE {}=? AND {} {} ?"; + public static final String SQL_PATTERN_WITH_SUFFIX = "SELECT * FROM {} WHERE {}=? AND {}"; public static final String SCRIPT_SQL_CHECK_PATTERN = "SELECT 1 FROM {} "; diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java index 1bf6a75da..6fa0a17af 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/AbstractSqlRead.java @@ -51,10 +51,6 @@ public abstract class AbstractSqlRead implements SqlRead { stmt.setFetchSize(SqlReadConstant.FETCH_SIZE_MAX); stmt.setString(1, config.getApplicationName()); - if (sqlCmd.contains(config.getCustomFilterTypeField()) && StrUtil.isNotBlank(config.getCustomFilterType())) { - stmt.setString(2, config.getCustomFilterType()); - } - rs = stmt.executeQuery(); while (rs.next()) { diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/impl/ChainRead.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/impl/ChainRead.java index bb18c9f9b..af5217bce 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/impl/ChainRead.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/read/impl/ChainRead.java @@ -56,11 +56,11 @@ public class ChainRead extends AbstractSqlRead { public String buildQuerySql() { String chainTableName = super.config.getChainTableName(); String chainApplicationNameField = super.config.getChainApplicationNameField(); - String chainSuffixTypeField = super.config.getCustomFilterTypeField(); - String chainSuffixOperator = super.config.getCustomFilterOperator(); - if (StrUtil.isNotBlank(chainSuffixTypeField) && StrUtil.isNotBlank(chainSuffixOperator)) { + String customFilterType = super.config.getCustomFilterType(); + + if (StrUtil.isNotBlank(customFilterType)) { return StrUtil.format(SqlReadConstant.SQL_PATTERN_WITH_SUFFIX, chainTableName, - chainApplicationNameField, chainSuffixTypeField, chainSuffixOperator); + chainApplicationNameField, customFilterType); } else { return StrUtil.format(SqlReadConstant.SQL_PATTERN, chainTableName, chainApplicationNameField); } diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java index 32c01ef94..ac89d3b91 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java @@ -76,16 +76,6 @@ public class SQLParserVO { */ private String customFilterType; - /** - * 自定义过滤操作符 - */ - private String customFilterOperator; - - /** - * 自定义过滤字段名 - */ - private String customFilterTypeField = "custom_filter_type"; - /** * 脚本 node 表名 */ @@ -359,20 +349,4 @@ public class SQLParserVO { public void setCustomFilterType(String customFilterType) { this.customFilterType = customFilterType; } - - public String getCustomFilterTypeField() { - return customFilterTypeField; - } - - public void setCustomFilterTypeField(String customFilterTypeField) { - this.customFilterTypeField = customFilterTypeField; - } - - public String getCustomFilterOperator() { - return customFilterOperator; - } - - public void setCustomFilterOperator(String customFilterOperator) { - this.customFilterOperator = customFilterOperator; - } } diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix-xml.properties index 3446ccc5f..ab289223f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix-xml.properties +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix-xml.properties @@ -3,9 +3,7 @@ liteflow.rule-source-ext-data={\ "chainTableName":"EL_TABLE",\ "chainApplicationNameField":"application_name",\ "chainNameField":"chain_name",\ - "customFilterTypeField":"custom_filter_type",\ - "customFilterOperator":"LIKE",\ - "customFilterType":"%biz1",\ + "customFilterType":"custom_filter_type = 'biz1'",\ "elDataField":"EL_DATA",\ "scriptTableName":"script_node_table",\ "scriptApplicationNameField":"application_name",\ diff --git a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix2-xml.properties b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix2-xml.properties index 914c96a3c..09e7a7102 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix2-xml.properties +++ b/liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-data-source-with-suffix2-xml.properties @@ -3,9 +3,7 @@ liteflow.rule-source-ext-data={\ "chainTableName":"EL_TABLE",\ "chainApplicationNameField":"application_name",\ "chainNameField":"chain_name",\ - "customFilterTypeField":"custom_filter_type",\ - "customFilterOperator":"LIKE",\ - "customFilterType":"%biz2",\ + "customFilterType":"custom_filter_type = 'biz2' ",\ "elDataField":"EL_DATA",\ "scriptTableName":"script_node_table",\ "scriptApplicationNameField":"application_name",\