Browse Source

数组无法复制的问题

master
richie 4 years ago
parent
commit
4e6df31222
  1. 3
      plugin.xml
  2. 5
      src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java

3
plugin.xml

@ -3,12 +3,13 @@
<id>com.fr.plugin.db.es.v10</id>
<name><![CDATA[Elasticsearch数据集]]></name>
<active>yes</active>
<version>2.0.1</version>
<version>2.0.2</version>
<env-version>10.0</env-version>
<jartime>2019-10-25</jartime>
<vendor>fanruan.richie</vendor>
<description><![CDATA[Elasticsearch数据查询。]]></description>
<change-notes><![CDATA[
[2021-01-14]修改链表的生成方式,解决配置无法被克隆的问题。<br/>
[2020-11-04]修复取消预览时连接没有被关闭的问。<br/>
[2020-11-03]支持通过https协议连接服务器。<br/>
[2020-09-09]查询语句中可以使用函数拼接。<br>

5
src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java

@ -14,7 +14,6 @@ import com.fr.config.holder.Conf;
import com.fr.data.impl.Connection;
import com.fr.general.data.DataModel;
import com.fr.intelli.record.Focus;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.db.es.fun.help.RenderUtils;
import com.fr.plugin.db.es.fun.query.QueryBuilder;
import com.fr.plugin.db.es.fun.type.ConverterType;
@ -31,8 +30,8 @@ import com.fr.third.fasterxml.jackson.annotation.JsonInclude;
import com.fr.third.fasterxml.jackson.databind.JsonNode;
import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
import com.fr.third.fasterxml.jackson.databind.SerializationFeature;
import com.fr.third.guava.collect.Lists;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicInteger;
@ -143,7 +142,7 @@ public class ElasticsearchTableData extends BaseTableData {
ElasticsearchConnection connection = getConnection();
Collection<ParameterProvider> parameterCollection = this.parameters.get();
if (parameterCollection.isEmpty()) {
this.parameters.set(Arrays.asList(ParameterKit.analyze4Parameters(query.get(), false)));
this.parameters.set(Lists.newArrayList(ParameterKit.analyze4Parameters(query.get(), false)));
}
ParameterProvider[] parameterProviders = processParameters(calculator);
ParameterProvider[] ps = Calculator.processParameters(calculator, parameterProviders);

Loading…
Cancel
Save