# HG changeset patch # User Raimund Renkert # Date 1430153339 -7200 # Node ID 93076cf1af9736e6703eea3209e73283b200353a # Parent 1567d2842b91983ffd97b300acf9d02df2219711 Updated model. diff -r 1567d2842b91 -r 93076cf1af97 src/main/java/de/intevation/lada/model/land/Messprogramm.java --- a/src/main/java/de/intevation/lada/model/land/Messprogramm.java Mon Apr 27 18:48:26 2015 +0200 +++ b/src/main/java/de/intevation/lada/model/land/Messprogramm.java Mon Apr 27 18:48:59 2015 +0200 @@ -27,24 +27,63 @@ @Id private Integer id; - private Timestamp bis; + @Column(name="ba_id") + private String baId; + + @Column(name="datenbasis_id") + private Integer datenbasisId; + + @Column(name="gem_id") + private String gemId; + + @Column(name="gueltig_bis") + private Integer gueltigBis; + + @Column(name="gueltig_von") + private Integer gueltigVon; + + @Column(name="intervall_offset") + private Integer intervallOffset; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; @Column(name="media_desk") private String mediaDesk; + @Column(name="mst_id") + private String mstId; + private String name; + @Column(name="netzbetreiber_id") + private String netzbetreiberId; + @Column(name="ort_id") - private Long ortId; + private Integer ortId; + + @Column(name="probe_kommentar") + private String probeKommentar; + + @Column(name="probe_nehmer_id") + private Integer probeNehmerId; + + @Column(name="probenart_id") + private Integer probenartId; + + private String probenintervall; + + @Column(name="teilintervall_bis") + private Integer teilintervallBis; + + @Column(name="teilintervall_von") + private Integer teilintervallVon; + + private Boolean test; @Column(name="umw_id") private String umwId; - private Timestamp von; - - @Column(name="intervall_id") - private Integer messprogrammIntervall; - public Messprogramm() { } @@ -56,12 +95,60 @@ this.id = id; } - public Timestamp getBis() { - return this.bis; + public String getBaId() { + return this.baId; } - public void setBis(Timestamp bis) { - this.bis = bis; + public void setBaId(String baId) { + this.baId = baId; + } + + public Integer getDatenbasisId() { + return this.datenbasisId; + } + + public void setDatenbasisId(Integer datenbasisId) { + this.datenbasisId = datenbasisId; + } + + public String getGemId() { + return this.gemId; + } + + public void setGemId(String gemId) { + this.gemId = gemId; + } + + public Integer getGueltigBis() { + return this.gueltigBis; + } + + public void setGueltigBis(Integer gueltigBis) { + this.gueltigBis = gueltigBis; + } + + public Integer getGueltigVon() { + return this.gueltigVon; + } + + public void setGueltigVon(Integer gueltigVon) { + this.gueltigVon = gueltigVon; + } + + public Integer getIntervallOffset() { + return this.intervallOffset; + } + + public void setIntervallOffset(Integer intervallOffset) { + this.intervallOffset = intervallOffset; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; } public String getMediaDesk() { @@ -72,6 +159,14 @@ this.mediaDesk = mediaDesk; } + public String getMstId() { + return this.mstId; + } + + public void setMstId(String mstId) { + this.mstId = mstId; + } + public String getName() { return this.name; } @@ -80,14 +175,78 @@ this.name = name; } - public Long getOrtId() { + public String getNetzbetreiberId() { + return this.netzbetreiberId; + } + + public void setNetzbetreiberId(String netzbetreiberId) { + this.netzbetreiberId = netzbetreiberId; + } + + public Integer getOrtId() { return this.ortId; } - public void setOrtId(Long ortId) { + public void setOrtId(Integer ortId) { this.ortId = ortId; } + public String getProbeKommentar() { + return this.probeKommentar; + } + + public void setProbeKommentar(String probeKommentar) { + this.probeKommentar = probeKommentar; + } + + public Integer getProbeNehmerId() { + return this.probeNehmerId; + } + + public void setProbeNehmerId(Integer probeNehmerId) { + this.probeNehmerId = probeNehmerId; + } + + public Integer getProbenartId() { + return this.probenartId; + } + + public void setProbenartId(Integer probenartId) { + this.probenartId = probenartId; + } + + public String getProbenintervall() { + return this.probenintervall; + } + + public void setProbenintervall(String probenintervall) { + this.probenintervall = probenintervall; + } + + public Integer getTeilintervallBis() { + return this.teilintervallBis; + } + + public void setTeilintervallBis(Integer teilintervallBis) { + this.teilintervallBis = teilintervallBis; + } + + public Integer getTeilintervallVon() { + return this.teilintervallVon; + } + + public void setTeilintervallVon(Integer teilintervallVon) { + this.teilintervallVon = teilintervallVon; + } + + public Boolean getTest() { + return this.test; + } + + public void setTest(Boolean test) { + this.test = test; + } + public String getUmwId() { return this.umwId; } @@ -95,20 +254,4 @@ public void setUmwId(String umwId) { this.umwId = umwId; } - - public Timestamp getVon() { - return this.von; - } - - public void setVon(Timestamp von) { - this.von = von; - } - - public Integer getMessprogrammIntervall() { - return this.messprogrammIntervall; - } - - public void setMessprogrammIntervall(Integer messprogrammIntervall) { - this.messprogrammIntervall = messprogrammIntervall; - } } diff -r 1567d2842b91 -r 93076cf1af97 src/main/java/de/intevation/lada/model/land/MessprogrammIntervall.java --- a/src/main/java/de/intevation/lada/model/land/MessprogrammIntervall.java Mon Apr 27 18:48:26 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model.land; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - - -/** - * The persistent class for the messprogramm_intervall database table. - */ -@Entity -@Table(name="messprogramm_intervall") -public class MessprogrammIntervall implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - private Integer id; - - private String kommentar; - - private String name; - - public MessprogrammIntervall() { - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getKommentar() { - return this.kommentar; - } - - public void setKommentar(String kommentar) { - this.kommentar = kommentar; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } -} diff -r 1567d2842b91 -r 93076cf1af97 src/main/java/de/intevation/lada/model/land/MessprogrammMessung.java --- a/src/main/java/de/intevation/lada/model/land/MessprogrammMessung.java Mon Apr 27 18:48:26 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU GPL (v>=3) - * and comes with ABSOLUTELY NO WARRANTY! Check out - * the documentation coming with IMIS-Labordaten-Application for details. - */ -package de.intevation.lada.model.land; - -import java.io.Serializable; -import javax.persistence.*; - - -/** - * The persistent class for the messprogramm_messung database table. - */ -@Entity -@Table(name="messprogramm_messung") -public class MessprogrammMessung implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - private Integer id; - - @Column(name="mmt_id") - private String mmtId; - - @ManyToOne - private Messprogramm messprogramm; - - public MessprogrammMessung() { - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getMmtId() { - return this.mmtId; - } - - public void setMmtId(String mmtId) { - this.mmtId = mmtId; - } - - public Messprogramm getMessprogramm() { - return this.messprogramm; - } - - public void setMessprogramm(Messprogramm messprogramm) { - this.messprogramm = messprogramm; - } - -} diff -r 1567d2842b91 -r 93076cf1af97 src/main/java/de/intevation/lada/model/land/MessprogrammMmt.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/model/land/MessprogrammMmt.java Mon Apr 27 18:48:59 2015 +0200 @@ -0,0 +1,78 @@ +package de.intevation.lada.model.land; + +import java.io.Serializable; +import java.sql.Timestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.mapping.Array; + + +/** + * The persistent class for the messprogramm_mmt database table. + */ +@Entity +@Table(name="messprogramm_mmt") +public class MessprogrammMmt implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private Integer id; + + @Column(name="letzte_aenderung") + private Timestamp letzteAenderung; + + private Array messgroessen; + + @Column(name="mmt_id") + private String mmtId; + + @Column(name="messprogramm_id") + private Integer messprogrammId; + + public MessprogrammMmt() { + } + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Timestamp getLetzteAenderung() { + return this.letzteAenderung; + } + + public void setLetzteAenderung(Timestamp letzteAenderung) { + this.letzteAenderung = letzteAenderung; + } + + public Array getMessgroessen() { + return this.messgroessen; + } + + public void setMessgroessen(Array messgroessen) { + this.messgroessen = messgroessen; + } + + public String getMmtId() { + return this.mmtId; + } + + public void setMmtId(String mmtId) { + this.mmtId = mmtId; + } + + public Integer getMessprogrammId() { + return this.messprogrammId; + } + + public void setMessprogramm(Integer messprogrammId) { + this.messprogrammId = messprogrammId; + } +}