From 1f2f489c6364b674d97560d826d3d28f6e964e82 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 10 Jan 2024 17:07:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E3=80=91=E4=BD=BF=E7=94=A8SqlServer=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84sql=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=BB=86=E8=A1=A8=E8=A7=86=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/ApiProvider.java | 14 +- .../provider/datasource/EsProvider.java | 10 +- .../provider/datasource/JdbcProvider.java | 19 ++- .../sqlserver/SqlserverQueryProvider.java | 19 ++- .../service/datasource/DatasourceService.java | 58 +++++--- .../resources/db/migration/V60__1.18.15.sql | 3 + .../common/base/domain/Datasource.java | 2 + .../common/base/domain/DatasourceExample.java | 126 ++++++++++++++---- .../common/base/mapper/DatasourceMapper.xml | 79 ++++++----- .../plugins/datasource/entity/Status.java | 9 ++ .../provider/DefaultJdbcProvider.java | 8 ++ .../plugins/datasource/provider/Provider.java | 3 + 12 files changed, 257 insertions(+), 93 deletions(-) create mode 100644 core/backend/src/main/resources/db/migration/V60__1.18.15.sql create mode 100644 sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/entity/Status.java diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index 4f850deeea..439c538a0b 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -11,11 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.JsonObject; -import io.dataease.controller.sys.response.BasicInfo; import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.plugins.common.dto.datasource.TableDesc; import io.dataease.plugins.common.dto.datasource.TableField; import io.dataease.plugins.common.request.datasource.DatasourceRequest; +import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.Provider; import com.jayway.jsonpath.JsonPath; import io.dataease.commons.utils.HttpClientConfig; @@ -23,14 +23,9 @@ import io.dataease.commons.utils.HttpClientUtil; import io.dataease.controller.request.datasource.ApiDefinition; import io.dataease.controller.request.datasource.ApiDefinitionRequest; -import io.dataease.service.system.SystemParameterService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; - import org.springframework.stereotype.Service; - - -import javax.annotation.Resource; import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; @@ -106,6 +101,13 @@ public class ApiProvider extends Provider { return tableFields; } + @Override + public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception { + Status status = new Status(); + status.setStatus(checkStatus(datasourceRequest)); + return status; + } + public String checkStatus(DatasourceRequest datasourceRequest) throws Exception { Gson gson = new Gson(); List apiDefinitionList = gson.fromJson(datasourceRequest.getDatasource().getConfiguration(), new TypeToken>() { diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java index 4bbc3b4787..c4518f15a8 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java @@ -14,6 +14,7 @@ import io.dataease.plugins.common.dto.datasource.TableDesc; import io.dataease.plugins.common.dto.datasource.TableField; import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.datasource.DatasourceRequest; +import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.Provider; import io.dataease.provider.query.es.EsQueryProvider; import org.apache.commons.codec.binary.Base64; @@ -181,7 +182,7 @@ public class EsProvider extends Provider { } for (String[] row : esResponse.getRows()) { - if(!row[1].equalsIgnoreCase("STRUCT") && !row[2].equalsIgnoreCase("unsupported")){ + if (!row[1].equalsIgnoreCase("STRUCT") && !row[2].equalsIgnoreCase("unsupported")) { TableField field = new TableField(); field.setFieldName(row[0]); field.setRemarks(row[0]); @@ -251,6 +252,13 @@ public class EsProvider extends Provider { return new ArrayList<>(); } + @Override + public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception { + Status status = new Status(); + status.setStatus(checkStatus(datasourceRequest)); + return status; + } + @Override public String checkStatus(DatasourceRequest datasourceRequest) throws Exception { diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 63300ea9fd..5238f3d664 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -18,6 +18,7 @@ import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.datasource.DatasourceRequest; import io.dataease.plugins.common.util.SpringContextUtil; import io.dataease.plugins.datasource.entity.JdbcConfiguration; +import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.DefaultJdbcProvider; import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader; import io.dataease.plugins.datasource.query.QueryProvider; @@ -369,6 +370,22 @@ public class JdbcProvider extends DefaultJdbcProvider { return list; } + @Override + public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception { + Status status = new Status(); + String queryStr = getTablesSql(datasourceRequest); + JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); + int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0; + try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) { + status.setVersion(String.valueOf(con.getMetaData().getDatabaseMajorVersion())); + } catch (Exception e) { + LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e); + DataEaseException.throwException(e.getMessage()); + } + status.setStatus("Success"); + return status; + } + @Override public String checkStatus(DatasourceRequest datasourceRequest) throws Exception { String queryStr = getTablesSql(datasourceRequest); @@ -377,7 +394,7 @@ public class JdbcProvider extends DefaultJdbcProvider { try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) { } catch (Exception e) { LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e); - io.dataease.plugins.common.exception.DataEaseException.throwException(e.getMessage()); + DataEaseException.throwException(e.getMessage()); } return "Success"; } diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 57d428638c..bec8a38d11 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -529,14 +529,21 @@ public class SqlserverQueryProvider extends QueryProvider { return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, null, view, needOrder, true); } - @Override public String getSQLWithPage(boolean isTable, String sql, List xAxis, FilterTreeObj fieldCustomFilter, List rowPermissionsTree, List extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, PageInfo pageInfo) { - boolean isPage = (pageInfo.getGoPage() != null && pageInfo.getPageSize() != null); - String limit = (isPage ? " OFFSET " + (pageInfo.getGoPage() - 1) * pageInfo.getPageSize() + " ROW FETCH NEXT " + pageInfo.getPageSize() + " ROW ONLY " : ""); - if (isTable) { - return originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit; + if (Integer.valueOf(ds.getVersion()) < 11) { + if (isTable) { + return getSQLTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view); + } else { + return getSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view); + } } else { - return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit; + boolean isPage = (pageInfo.getGoPage() != null && pageInfo.getPageSize() != null); + String limit = (isPage ? " OFFSET " + (pageInfo.getGoPage() - 1) * pageInfo.getPageSize() + " ROW FETCH NEXT " + pageInfo.getPageSize() + " ROW ONLY " : ""); + if (isTable) { + return originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit; + } else { + return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit; + } } } diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 0189e64be2..81d1a028e8 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -42,6 +42,7 @@ import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.datasource.DatasourceRequest; import io.dataease.plugins.common.util.SpringContextUtil; import io.dataease.plugins.datasource.entity.JdbcConfiguration; +import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.Provider; import io.dataease.provider.ProviderFactory; import io.dataease.provider.datasource.ApiProvider; @@ -53,6 +54,8 @@ import io.dataease.service.system.SystemParameterService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.zookeeper.data.Stat; +import org.mozilla.javascript.EcmaError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.data.redis.core.RedisTemplate; @@ -116,7 +119,9 @@ public class DatasourceService { datasource.setUpdateTime(currentTimeMillis); datasource.setCreateTime(currentTimeMillis); datasource.setCreateBy(String.valueOf(AuthUtils.getUser().getUsername())); - checkAndUpdateDatasourceStatus(datasource); + Status status = checkDatasourceStatus(datasource); + datasource.setStatus(status.getStatus()); + datasource.setVersion(status.getVersion()); datasourceMapper.insertSelective(datasource); handleConnectionPool(datasource, "add"); sysAuthService.copyAuth(datasource.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASOURCE); @@ -278,7 +283,9 @@ public class DatasourceService { public void updateDatasource(String id, Datasource datasource) { DatasourceExample example = new DatasourceExample(); example.createCriteria().andIdEqualTo(id); - checkAndUpdateDatasourceStatus(datasource); + Status status = checkDatasourceStatus(datasource); + datasource.setStatus(status.getStatus()); + datasource.setVersion(status.getVersion()); datasourceMapper.updateByExampleSelective(datasource, example); handleConnectionPool(id); @@ -328,15 +335,15 @@ public class DatasourceService { datasourceProvider.checkConfiguration(datasource); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); - String datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); + Status datasourceStatus = datasourceProvider.checkDsStatus(datasourceRequest); if (datasource.getType().equalsIgnoreCase("api")) { int success = 0; List apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken>() { }.getType()); List apiDefinitionListWithStatus = new ArrayList<>(); - if (StringUtils.isNotEmpty(datasourceStatus)) { - JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus).getAsJsonObject(); + if (StringUtils.isNotEmpty(datasourceStatus.getStatus())) { + JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus.getStatus()).getAsJsonObject(); for (ApiDefinition apiDefinition : apiDefinitionList) { String status = apiItemStatuses.get(apiDefinition.getName()).getAsString(); apiDefinition.setStatus(status); @@ -349,7 +356,7 @@ public class DatasourceService { datasourceDTO.setApiConfiguration(apiDefinitionListWithStatus); if (success == apiDefinitionList.size()) { - datasource.setStatus(datasourceStatus); + datasource.setStatus(datasourceStatus.getStatus()); return ResultHolder.success(datasourceDTO); } if (success > 0 && success < apiDefinitionList.size()) { @@ -368,16 +375,16 @@ public class DatasourceService { if (datasource == null) { return ResultHolder.error("Can not find datasource: " + datasourceId); } - String datasourceStatus = null; + Status datasourceStatus = new Status(); try { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); - datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); + datasourceStatus = datasourceProvider.checkDsStatus(datasourceRequest); if (datasource.getType().equalsIgnoreCase("api")) { List apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken>() { }.getType()); - JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus).getAsJsonObject(); + JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus.getStatus()).getAsJsonObject(); int success = 0; for (ApiDefinition apiDefinition : apiDefinitionList) { String status = apiItemStatuses.get(apiDefinition.getName()).getAsString(); @@ -387,7 +394,7 @@ public class DatasourceService { } } if (success == apiDefinitionList.size()) { - datasource.setStatus(datasourceStatus); + datasource.setStatus(datasourceStatus.getStatus()); return ResultHolder.success(datasource); } if (success > 0 && success < apiDefinitionList.size()) { @@ -399,14 +406,14 @@ public class DatasourceService { return ResultHolder.success("Success"); } catch (Exception e) { e.printStackTrace(); - datasourceStatus = "Error"; + datasourceStatus.setStatus("Error"); return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage()); } finally { Datasource record = new Datasource(); - record.setStatus(datasourceStatus); + record.setStatus(datasourceStatus.getStatus()); + record.setVersion(datasourceStatus.getVersion()); DatasourceExample example = new DatasourceExample(); example.createCriteria().andIdEqualTo(datasource.getId()); - System.out.println(new Gson().toJson(record)); datasourceMapper.updateByExampleSelective(record, example); } } @@ -427,7 +434,7 @@ public class DatasourceService { DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); if (!ds.getType().equalsIgnoreCase(DatasetType.API.name())) { - datasourceProvider.checkStatus(datasourceRequest); + datasourceProvider.checkDsStatus(datasourceRequest); } List tables = datasourceProvider.getTables(datasourceRequest); @@ -479,6 +486,15 @@ public class DatasourceService { List datasources = datasourceMapper.selectByExampleWithBLOBs(new DatasourceExample()); datasources.forEach(datasource -> { commonThreadPool.addTask(() -> { + try { + DatasourceExample example = new DatasourceExample(); + example.createCriteria().andIdEqualTo(datasource.getId()); + Status status = checkDatasourceStatus(datasource); + Datasource record = new Datasource(); + record.setVersion(status.getVersion()); + record.setStatus(status.getStatus()); + datasourceMapper.updateByExampleSelective(record, example); + }catch (Exception ignore){} try { handleConnectionPool(datasource, "add"); } catch (Exception e) { @@ -536,16 +552,17 @@ public class DatasourceService { return datasourceMapper.selectByExampleWithBLOBs(example); } - public void checkAndUpdateDatasourceStatus(Datasource datasource) { + public Status checkDatasourceStatus(Datasource datasource) { + Status status = new Status(); try { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); - String status = datasourceProvider.checkStatus(datasourceRequest); - datasource.setStatus(status); + status = datasourceProvider.checkDsStatus(datasourceRequest); } catch (Exception e) { - datasource.setStatus("Error"); + status.setStatus("Error"); } + return status; } private void checkAndUpdateDatasourceStatus(Datasource datasource, Boolean withMsg) { @@ -556,8 +573,9 @@ public class DatasourceService { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); - String status = datasourceProvider.checkStatus(datasourceRequest); - record.setStatus(status); + Status status = datasourceProvider.checkDsStatus(datasourceRequest); + datasource.setStatus(status.getStatus()); + datasource.setVersion(status.getVersion()); datasourceMapper.updateByExampleSelective(record, example); } catch (Exception e) { Datasource temp = datasourceMapper.selectByPrimaryKey(datasource.getId()); diff --git a/core/backend/src/main/resources/db/migration/V60__1.18.15.sql b/core/backend/src/main/resources/db/migration/V60__1.18.15.sql new file mode 100644 index 0000000000..f812e6c05e --- /dev/null +++ b/core/backend/src/main/resources/db/migration/V60__1.18.15.sql @@ -0,0 +1,3 @@ + ALTER TABLE `datasource` + ADD COLUMN `version` varchar(255) NULL COMMENT '版本' AFTER `status`; + diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/Datasource.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/Datasource.java index f7dba9ea9d..3f70bcf627 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/Datasource.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/Datasource.java @@ -23,6 +23,8 @@ public class Datasource implements Serializable { private String createBy; @ApiModelProperty("状态") private String status; + @ApiModelProperty("版本") + private String version; @ApiModelProperty(value = "配置详情", required = true) private String configuration; diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DatasourceExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DatasourceExample.java index de33817272..8668cc4fbb 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DatasourceExample.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DatasourceExample.java @@ -384,6 +384,76 @@ public class DatasourceExample { return (Criteria) this; } + public Criteria andConfigurationIsNull() { + addCriterion("configuration is null"); + return (Criteria) this; + } + + public Criteria andConfigurationIsNotNull() { + addCriterion("configuration is not null"); + return (Criteria) this; + } + + public Criteria andConfigurationEqualTo(String value) { + addCriterion("configuration =", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationNotEqualTo(String value) { + addCriterion("configuration <>", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationGreaterThan(String value) { + addCriterion("configuration >", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationGreaterThanOrEqualTo(String value) { + addCriterion("configuration >=", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationLessThan(String value) { + addCriterion("configuration <", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationLessThanOrEqualTo(String value) { + addCriterion("configuration <=", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationLike(String value) { + addCriterion("configuration like", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationNotLike(String value) { + addCriterion("configuration not like", value, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationIn(List values) { + addCriterion("configuration in", values, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationNotIn(List values) { + addCriterion("configuration not in", values, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationBetween(String value1, String value2) { + addCriterion("configuration between", value1, value2, "configuration"); + return (Criteria) this; + } + + public Criteria andConfigurationNotBetween(String value1, String value2) { + addCriterion("configuration not between", value1, value2, "configuration"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; @@ -574,73 +644,73 @@ public class DatasourceExample { return (Criteria) this; } - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); + public Criteria andVersionIsNull() { + addCriterion("version is null"); return (Criteria) this; } - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); + public Criteria andVersionIsNotNull() { + addCriterion("version is not null"); return (Criteria) this; } - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); + public Criteria andVersionEqualTo(String value) { + addCriterion("version =", value, "version"); return (Criteria) this; } - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); + public Criteria andVersionNotEqualTo(String value) { + addCriterion("version <>", value, "version"); return (Criteria) this; } - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); + public Criteria andVersionGreaterThan(String value) { + addCriterion("version >", value, "version"); return (Criteria) this; } - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); + public Criteria andVersionGreaterThanOrEqualTo(String value) { + addCriterion("version >=", value, "version"); return (Criteria) this; } - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); + public Criteria andVersionLessThan(String value) { + addCriterion("version <", value, "version"); return (Criteria) this; } - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); + public Criteria andVersionLessThanOrEqualTo(String value) { + addCriterion("version <=", value, "version"); return (Criteria) this; } - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); + public Criteria andVersionLike(String value) { + addCriterion("version like", value, "version"); return (Criteria) this; } - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); + public Criteria andVersionNotLike(String value) { + addCriterion("version not like", value, "version"); return (Criteria) this; } - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); + public Criteria andVersionIn(List values) { + addCriterion("version in", values, "version"); return (Criteria) this; } - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); + public Criteria andVersionNotIn(List values) { + addCriterion("version not in", values, "version"); return (Criteria) this; } - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); + public Criteria andVersionBetween(String value1, String value2) { + addCriterion("version between", value1, value2, "version"); return (Criteria) this; } - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); + public Criteria andVersionNotBetween(String value1, String value2) { + addCriterion("version not between", value1, value2, "version"); return (Criteria) this; } } diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DatasourceMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DatasourceMapper.xml index 75fae42fe8..14b67d64b9 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DatasourceMapper.xml +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DatasourceMapper.xml @@ -6,13 +6,14 @@ + - + - + @@ -73,10 +74,10 @@ - id, `name`, `desc`, `type`, create_time, update_time, create_by, `status` + id, `name`, `desc`, `type`, configuration, create_time, update_time, create_by, version - configuration + `status`