Pasa campos a la base de series temporales (e7e56e37) · Commits · REDMIC Project / Server / Time Series

time-series-view/src/main/java/es/redmic/timeseriesview/model/common/SeriesCommon.java

+40 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,14 @@ public abstract class SeriesCommon extends BaseTimeDataAbstractES {

		private String activityId;

		private double value;

		private Long dataDefinition;

		private Double z;

		private Double deviation;

		private Character qFlag = '0';

		private Character vFlag = 'U';
		@@ -42,6 +50,38 @@ public abstract class SeriesCommon extends BaseTimeDataAbstractES {
		this.activityId = activityId;
		}

		public double getValue() {
		return this.value;
		}

		public void setValue(double value) {
		this.value = value;
		}

		public Long getDataDefinition() {
		return dataDefinition;
		}

		public void setDataDefinition(Long dataDefinition) {
		this.dataDefinition = dataDefinition;
		}

		public Double getZ() {
		return z;
		}

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

		public Double getDeviation() {
		return deviation;
		}

		public void setDeviation(Double deviation) {
		this.deviation = deviation;
		}

		@JsonProperty(value = "qFlag")
		public Character getQFlag() {
		return qFlag;

+0 −52

Original line number	Diff line number	Diff line
		@@ -24,56 +24,4 @@ import es.redmic.timeseriesview.model.common.SeriesCommon;

		public class TimeSeries extends SeriesCommon {

		private Double z;

		private Double deviation;

		private double value;

		private Long dataDefinition;

		public Double getZ() {
		return z;
		}

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

		public Double getDeviation() {
		return deviation;
		}

		public void setDeviation(Double deviation) {
		this.deviation = deviation;
		}

		public double getValue() {
		return this.value;
		}

		public void setValue(double value) {
		this.value = value;
		}

		public Long getDataDefinition() {
		return dataDefinition;
		}

		public void setDataDefinition(Long dataDefinition) {
		this.dataDefinition = dataDefinition;
		}

		@Override
		public boolean equals(Object obj) {

		if (this == obj)
		return true;
		if (obj == null)
		return false;
		if (getClass() != obj.getClass())
		return false;

		return super.equals(obj);
		}
		}