Commit e991dae8 authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia dto de consulta para controladores geodata

parent 52cead86

src/main/java/es/redmic/api/administrative/controller/ActivityController.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package es.redmic.api.administrative.controller; 
 */



import java.util.Arrays;

import java.util.List;



import javax.servlet.http.HttpServletResponse;

import javax.validation.Valid;
@@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.PathVariable; 
import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.ResponseBody;

import org.springframework.web.bind.annotation.RestController;
@@ -49,7 +47,6 @@ import es.redmic.models.es.common.dto.JSONCollectionDTO; 
import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.common.utils.HierarchicalUtils;



@RestController

src/main/java/es/redmic/api/geodata/citation/controller/CitationByDocumentController.java

+3 −3
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ import es.redmic.api.common.controller.RBaseController; 
import es.redmic.es.geodata.citation.service.CitationESService;

import es.redmic.models.es.common.dto.ElasticSearchDTO;

import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.geojson.citation.dto.CitationDTO;

import es.redmic.models.es.geojson.common.model.GeoPointData;



@RestController

@RequestMapping(value = "${controller.mapping.CITATIONS_BY_DOCUMENTS}")

public class CitationByDocumentController extends RBaseController<GeoPointData, CitationDTO, DataQueryDTO> {

public class CitationByDocumentController extends RBaseController<GeoPointData, CitationDTO, GeoDataQueryDTO> {



	private CitationESService serviceES;
@@ -53,7 +53,7 @@ public class CitationByDocumentController extends RBaseController<GeoPointData, 


	@PostMapping(value = "/_search")

	@ResponseBody

	public SuperDTO getCitations(@Valid @RequestBody DataQueryDTO queryDTO, BindingResult bindingResult, @PathVariable("documentId") String documentId) {

	public SuperDTO getCitations(@Valid @RequestBody GeoDataQueryDTO queryDTO, BindingResult bindingResult, @PathVariable("documentId") String documentId) {



		processQuery(queryDTO, bindingResult);

src/main/java/es/redmic/api/geodata/citation/controller/CitationController.java

+5 −5
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ import es.redmic.db.geodata.citation.model.Citation; 
import es.redmic.db.geodata.citation.service.CitationService;

import es.redmic.es.common.queryFactory.geodata.CitationQueryUtils;

import es.redmic.es.geodata.citation.service.CitationESService;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.geojson.citation.dto.CitationDTO;

import es.redmic.models.es.geojson.common.model.GeoPointData;



@RestController

@RequestMapping(value = "${controller.mapping.CITATIONS_BY_ACTIVITY}")

public class CitationController extends RWGeoDataController<Citation, GeoPointData, CitationDTO, DataQueryDTO> {

public class CitationController extends RWGeoDataController<Citation, GeoPointData, CitationDTO, GeoDataQueryDTO> {



	@Autowired

	public CitationController(CitationService service, CitationESService serviceES) {

src/main/java/es/redmic/api/geodata/geofixedstation/controller/GeoFixedObjectCollectingSeriesController.java

+9 −8
Original line number Diff line number Diff line
@@ -38,13 +38,14 @@ import es.redmic.es.common.queryFactory.geodata.GeoFixedSeriesQueryUtils; 
import es.redmic.es.geodata.geofixedstation.service.GeoFixedObjectCollectingSeriesESService;

import es.redmic.models.es.common.DataPrefixType;

import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.geojson.common.model.GeoLineStringData;

import es.redmic.models.es.geojson.geofixedstation.dto.GeoFixedObjectCollectingSeriesDTO;



@RestController

@RequestMapping(value = "${controller.mapping.OBJECTCOLLECTING_BY_ACTIVITY}")

public class GeoFixedObjectCollectingSeriesController extends RWGeoDataController<FixedSurvey, GeoLineStringData, GeoFixedObjectCollectingSeriesDTO, DataQueryDTO>{

public class GeoFixedObjectCollectingSeriesController

	extends RWGeoDataController<FixedSurvey, GeoLineStringData, GeoFixedObjectCollectingSeriesDTO, GeoDataQueryDTO>{



	@Autowired

	public GeoFixedObjectCollectingSeriesController(FixedSurveyObjectCollectingService service, GeoFixedObjectCollectingSeriesESService serviceES) {

src/main/java/es/redmic/api/geodata/geofixedstation/controller/GeoFixedTimeSeriesController.java

+9 −8
Original line number Diff line number Diff line
@@ -36,13 +36,14 @@ import es.redmic.db.geodata.properties.fixedsurvey.service.FixedSurveyTimeSeries 
import es.redmic.es.geodata.geofixedstation.service.GeoFixedTimeSeriesESService;

import es.redmic.models.es.common.DataPrefixType;

import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.geojson.common.model.GeoPointData;

import es.redmic.models.es.geojson.geofixedstation.dto.GeoFixedTimeSeriesDTO;



@RestController

@RequestMapping("${controller.mapping.SURVEYSTATIONS_BY_ACTIVITY}")

public class GeoFixedTimeSeriesController extends RWGeoDataController<FixedSurvey, GeoPointData, GeoFixedTimeSeriesDTO, DataQueryDTO> {

public class GeoFixedTimeSeriesController

	extends RWGeoDataController<FixedSurvey, GeoPointData, GeoFixedTimeSeriesDTO, GeoDataQueryDTO> {



	@Autowired

	public GeoFixedTimeSeriesController(FixedSurveyTimeSeriesService service, GeoFixedTimeSeriesESService ESService) {