Commit 0f984c1f authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

feature-realTime

See merge request redmic-project/server/library/elasticsearch!3
parents af1cdde0 5ce30ed3

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>elasticsearch</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.6.1</version>

	<name>ElasticSearch</name>

	<description>ElasticSearch library </description>
@@ -25,7 +25,7 @@ 
		<java.version>1.8</java.version>



		<!-- REDMIC -->

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.models.version>0.6.1</redmic.models.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>

src/main/java/es/redmic/es/geodata/geofixedstation/repository/GeoFixedBaseESRepository.java

+3 −3
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ public abstract class GeoFixedBaseESRepository<TModel extends Feature<GeoDataPro 


	/*

	 * Función que sobrescribe a getTermQuery de RElasticSearchRepository para

	 * añadir implementación específica para crear una query a apartir de una

	 * serie de términos obtenidos por el controlador.

	 * añadir implementación específica para crear una query a apartir de una serie

	 * de términos obtenidos por el controlador.

	 */

	@SuppressWarnings("unchecked")

	@Override
@@ -60,7 +60,7 @@ public abstract class GeoFixedBaseESRepository<TModel extends Feature<GeoDataPro 
			query.must(QueryBuilders.nestedQuery("properties.measurements",

					QueryBuilders.termsQuery("properties.measurements.parameter.path.hierarchy", ids), ScoreMode.Avg));

		}

		return query;

		return super.getTermQuery(terms, query);

	}



	@Override

src/main/java/es/redmic/es/geodata/geofixedstation/repository/GeoFixedTimeSeriesESRepository.java

+17 −1
Original line number Diff line number Diff line 
package es.redmic.es.geodata.geofixedstation.repository;



import java.util.Map;



import org.elasticsearch.index.query.BoolQueryBuilder;

import org.elasticsearch.index.query.QueryBuilder;

import org.elasticsearch.index.query.QueryBuilders;

import org.springframework.stereotype.Repository;



import es.redmic.es.common.queryFactory.geodata.GeoFixedTimeSeriesQueryUtils;
@@ -12,4 +17,15 @@ public class GeoFixedTimeSeriesESRepository extends GeoFixedBaseESRepository<Geo 
		super();

		setInternalQuery(GeoFixedTimeSeriesQueryUtils.INTERNAL_QUERY);

	}



	@Override

	public QueryBuilder getTermQuery(Map<String, Object> terms, BoolQueryBuilder query) {



		String dashboardProperty = "properties.site.dashboard";

		if (terms.containsKey(dashboardProperty) && ((Boolean) terms.get(dashboardProperty)).equals(true)) {

			query.must(QueryBuilders.existsQuery(dashboardProperty));

		}



		return super.getTermQuery(terms, query);

	}

}
 
 No newline at end of file

src/test/resources/geodata/infrastructure/model/infrastructure.json

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
			"rotate": 100,

			"remark": "Remark",

			"description": "Description",

			"dashboard": null,

			"name": "name",

			"code": "code",

			"url": null,

src/test/resources/geodata/infrastructure/model/searchWrapperInfrastructureModel.json

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
						"rotate": 100,

						"remark": "Remark",

						"description": "Description",

						"dashboard": null,

						"name": "name",

						"code": "code",

						"url": "http://webcam.es"