|
|
|
@ -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); |
|
|
|
|