Modifica dto de consultas por tipo de dato (7337ee1d) · Commits · REDMIC Project / Server / Library / Models

src/main/java/es/redmic/models/es/common/query/dto/DataQueryDTO.java

+11 −65

Original line number	Diff line number	Diff line
		@@ -20,72 +20,42 @@ package es.redmic.models.es.common.query.dto;
		* #L%
		*/

		import java.util.List;

		import javax.validation.Valid;
		import javax.validation.constraints.Size;

		import com.fasterxml.jackson.annotation.JsonFilter;
		import com.fasterxml.jackson.annotation.JsonProperty;
		import com.fasterxml.jackson.annotation.JsonView;
		import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDescription;
		import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaNotNull;

		import es.redmic.models.es.common.view.JsonViewsForQueryDTO;

		@JsonFilter("DataQueryDTO")
		@JsonSchemaNotNull
		public class DataQueryDTO extends GeoDataQueryDTO {
		public class DataQueryDTO extends DataAccessibilityQueryDTO {

		public DataQueryDTO() {
		super();
		}

		// Data
		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Size(max = 11)
		private List<String> qFlags;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Size(max = 5)
		private List<String> vFlags;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private DateLimitsDTO dateLimits;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		private String interval;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@JsonSchemaDescription("Obtiene registros de geometrías comprendidas dentro de los límites especificados.")
		@Valid
		private ZRangeDTO z;
		private BboxQueryDTO bbox;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private List<ValueQueryDTO> value;
		private DateLimitsDTO dateLimits;

		public Boolean queryIsEmpty() {
		return ((getBbox() == null) && (getPostFilter() == null) && (getText() == null));
		}

		@JsonProperty("qFlags")
		public List<String> getQFlags() {
		return qFlags;
		}

		@JsonProperty("qFlags")
		public void setQFlags(List<String> qFlags) {
		this.qFlags = qFlags;
		public BboxQueryDTO getBbox() {
		return bbox;
		}

		@JsonProperty("vFlags")
		public List<String> getVFlags() {
		return vFlags;
		}

		@JsonProperty("vFlags")
		public void setVFlags(List<String> vFlags) {
		this.vFlags = vFlags;
		public void setBbox(BboxQueryDTO bbox) {
		this.bbox = bbox;
		}

		public DateLimitsDTO getDateLimits() {
		@@ -95,28 +65,4 @@ public class DataQueryDTO extends GeoDataQueryDTO {
		public void setDateLimits(DateLimitsDTO dateLimits) {
		this.dateLimits = dateLimits;
		}

		public String getInterval() {
		return interval;
		}

		public void setInterval(String interval) {
		this.interval = interval;
		}

		public ZRangeDTO getZ() {
		return z;
		}

		public void setZ(ZRangeDTO z) {
		this.z = z;
		}

		public List<ValueQueryDTO> getValue() {
		return value;
		}

		public void setValue(List<ValueQueryDTO> value) {
		this.value = value;
		}
		}

src/main/java/es/redmic/models/es/common/query/dto/GeoDataQueryDTO.java

+89 −7

Original line number	Diff line number	Diff line
		package es.redmic.models.es.common.query.dto;

		import java.util.List;

		/*-
		* #%L
		* Models
		@@ -21,13 +23,17 @@ package es.redmic.models.es.common.query.dto;
		*/

		import javax.validation.Valid;
		import javax.validation.constraints.Size;

		import com.fasterxml.jackson.annotation.JsonFilter;
		import com.fasterxml.jackson.annotation.JsonProperty;
		import com.fasterxml.jackson.annotation.JsonView;
		import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDescription;
		import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaNotNull;

		import es.redmic.models.es.common.view.JsonViewsForQueryDTO;

		@JsonFilter("GeoDataQueryDTO")
		@JsonSchemaNotNull
		public class GeoDataQueryDTO extends DataAccessibilityQueryDTO {

		@@ -35,6 +41,30 @@ public class GeoDataQueryDTO extends DataAccessibilityQueryDTO {
		super();
		}

		// Data
		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Size(max = 11)
		private List<String> qFlags;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Size(max = 5)
		private List<String> vFlags;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private PrecisionQueryDTO precision;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		private String interval;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private ZRangeDTO z;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private List<ValueQueryDTO> value;

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@JsonSchemaDescription("Obtiene registros de geometrías comprendidas dentro de los límites especificados.")
		@Valid
		@@ -42,14 +72,26 @@ public class GeoDataQueryDTO extends DataAccessibilityQueryDTO {

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		@Valid
		private PrecisionQueryDTO precision;
		private DateLimitsDTO dateLimits;

		public BboxQueryDTO getBbox() {
		return bbox;
		@JsonProperty("qFlags")
		public List<String> getQFlags() {
		return qFlags;
		}

		public void setBbox(BboxQueryDTO bbox) {
		this.bbox = bbox;
		@JsonProperty("qFlags")
		public void setQFlags(List<String> qFlags) {
		this.qFlags = qFlags;
		}

		@JsonProperty("vFlags")
		public List<String> getVFlags() {
		return vFlags;
		}

		@JsonProperty("vFlags")
		public void setVFlags(List<String> vFlags) {
		this.vFlags = vFlags;
		}

		public PrecisionQueryDTO getPrecision() {
		@@ -59,4 +101,44 @@ public class GeoDataQueryDTO extends DataAccessibilityQueryDTO {
		public void setPrecision(PrecisionQueryDTO precision) {
		this.precision = precision;
		}

		public String getInterval() {
		return interval;
		}

		public void setInterval(String interval) {
		this.interval = interval;
		}

		public ZRangeDTO getZ() {
		return z;
		}

		public void setZ(ZRangeDTO z) {
		this.z = z;
		}

		public List<ValueQueryDTO> getValue() {
		return value;
		}

		public void setValue(List<ValueQueryDTO> value) {
		this.value = value;
		}

		public BboxQueryDTO getBbox() {
		return bbox;
		}

		public void setBbox(BboxQueryDTO bbox) {
		this.bbox = bbox;
		}

		public DateLimitsDTO getDateLimits() {
		return dateLimits;
		}

		public void setDateLimits(DateLimitsDTO dateLimits) {
		this.dateLimits = dateLimits;
		}
		}