diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java index e80253b7..66b07b53 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java @@ -1,39 +1,31 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; -import javax.persistence.*; -import com.jasamedika.medifirst2000.entities.Pegawai; - -import com.fasterxml.jackson.annotation.JsonBackReference; import com.jasamedika.medifirst2000.base.BaseTransaction; - -import javax.validation.constraints.NotNull; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * class AbsensiPegawai * * @author Generator */ +@Getter +@Setter @Entity @Table(name = "sdm_AbsensiPegawai_T") public class AbsensiPegawai extends BaseTransaction { + @ManyToOne @JoinColumn(name = "PegawaiFk") @NotNull(message = "Pegawai Harus Diisi") @Caption(value = "Pegawai") private Pegawai pegawai; - public Pegawai getPegawai() { - return pegawai; - } - - public void setPegawai(Pegawai pegawai) { - this.pegawai = pegawai; - } - @Column(name = "PegawaiFk", insertable = false, updatable = false) private Integer pegawaiId; @@ -41,24 +33,8 @@ public class AbsensiPegawai extends BaseTransaction { @Caption(value = "JamMasuk") private Date jamMasuk; - public Date getJamMasuk() { - return jamMasuk; - } - - public void setJamMasuk(Date jamMasuk) { - this.jamMasuk = jamMasuk; - } - - @Column(name = "JamKeluar", nullable = true, length = 100) + @Column(name = "JamKeluar", length = 100) @Caption(value = "JamKeluar") private Date jamKeluar; - public Date getJamKeluar() { - return jamKeluar; - } - - public void setJamKeluar(Date jamKeluar) { - this.jamKeluar = jamKeluar; - } - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java index cf85c11b..165534c0 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java @@ -1,48 +1,26 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import lombok.Getter; +import lombok.Setter; -@Table(name="activity_log") +import javax.persistence.*; + +import static javax.persistence.GenerationType.AUTO; + +@Getter +@Setter @Entity +@Table(name = "activity_log") public class ActivityLog { - + @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = AUTO) private Long id; - + @Column(name = "action") private String action; - - @Column(name = "detail", columnDefinition ="TEXT") + + @Column(name = "detail", columnDefinition = "TEXT") private String detail; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getDetail() { - return detail; - } - - public void setDetail(String detail) { - this.detail = detail; - } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java index c94c1d8d..1927fc9c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java @@ -15,6 +15,7 @@ import static javax.persistence.FetchType.LAZY; @Entity @Table(name = "ActivityPegawai_H") public class ActivityPegawai extends BaseTransaction { + private static final long serialVersionUID = 3739050768690435138L; @Caption(value = "keterangan") @@ -36,4 +37,5 @@ public class ActivityPegawai extends BaseTransaction { @Caption(value = "group") @Column(name = "GroupData", length = 250) private String group; + } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java index 80706b88..52a18d08 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java @@ -1,249 +1,97 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.*; +import java.util.Date; + +import static javax.persistence.FetchType.LAZY; + +@Getter +@Setter @Entity -@Table(name="AdmisiRencanaPindahRuangan_T") +@Table(name = "AdmisiRencanaPindahRuangan_T") @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) -public class AdmisiRencanaPindahRuangan extends BaseTransaction{ - - @ManyToOne(fetch=FetchType.LAZY) +public class AdmisiRencanaPindahRuangan extends BaseTransaction { + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRegistrasiPelayananPasienFk") - @Caption(value="Registrasi Pelayanan Pasien") + @Caption(value = "Registrasi Pelayanan Pasien") private AntrianPasienDiPeriksa registrasiPelayananPasien; - - @Column(name = "ObjectRegistrasiPelayananPasienFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectRegistrasiPelayananPasienFk", insertable = false, updatable = false) private String registrasiPelayananPasienId; - @Caption(value="Tanggal Keluar Rencana") - @Column(name = "TglKeluarRencana", nullable = true ) - private Date tglKeluarRencana ; - - @ManyToOne(fetch=FetchType.LAZY) + @Caption(value = "Tanggal Keluar Rencana") + @Column(name = "TglKeluarRencana") + private Date tglKeluarRencana; + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusKeluarRencanaFk") - @Caption(value="Status Keluar Rencana") + @Caption(value = "Status Keluar Rencana") private StatusKeluar statusKeluarRencana; - - @Column(name = "ObjectStatusKeluarRencanaFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectStatusKeluarRencanaFk", insertable = false, updatable = false) private Integer statusKeluarRencanaId; - @ManyToOne(fetch=FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasRencanaFk") - @Caption(value="Kelas Rencana") + @Caption(value = "Kelas Rencana") private Kelas kelasRencana; - - @Column(name = "ObjectKelasRencanaFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectKelasRencanaFk", insertable = false, updatable = false) private Integer kelasRencanaId; - - @ManyToOne(fetch=FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRuanganRencanaFk") - @Caption(value="Ruangan Rencana") + @Caption(value = "Ruangan Rencana") private Ruangan ruanganRencana; - - @Column(name = "ObjectRuanganRencanaFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectRuanganRencanaFk", insertable = false, updatable = false) private Integer ruanganRencanaId; - - @ManyToOne(fetch=FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasKamarRencanaFk") - @Caption(value="Kelas Kamar Rencana") + @Caption(value = "Kelas Kamar Rencana") private Kamar kelasKamarRencana; - - @Column(name = "ObjectKelasKamarRencanaFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectKelasKamarRencanaFk", insertable = false, updatable = false) private Integer kelasKamarRencanaId; - - @Caption(value="No Bed") - @Column(name = "NoBedRencana", nullable = true) + + @Caption(value = "No Bed") + @Column(name = "NoBedRencana") private Integer noBedRencana; - - @Caption(value="Keterangan Lainya") - @Column(name = "KeteranganLainya", nullable = true , length = 100) + + @Caption(value = "Keterangan Lainya") + @Column(name = "KeteranganLainya", length = 100) private String keteranganLainya; - - //----------------------------------------------------------------------------------------------- - - @ManyToOne(fetch=FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasAwalFk") - @Caption(value="Kelas Awal") + @Caption(value = "Kelas Awal") private Kelas kelasAwal; - - @Column(name = "ObjectKelasAwalFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectKelasAwalFk", insertable = false, updatable = false) private Integer kelasAwalId; - - @ManyToOne(fetch=FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRuanganAwalFk") - @Caption(value="Ruangan Awal") + @Caption(value = "Ruangan Awal") private Ruangan ruanganAwal; - - @Column(name = "ObjectRuanganAwalFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectRuanganAwalFk", insertable = false, updatable = false) private Integer ruanganAwalId; - - @ManyToOne(fetch=FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasKamarAwalFk") - @Caption(value="Kelas Kamar Awal") + @Caption(value = "Kelas Kamar Awal") private Kamar kelasKamarAwal; - - @Column(name = "ObjectKelasKamarAwalFk", insertable=false, updatable=false, nullable = true ) + + @Column(name = "ObjectKelasKamarAwalFk", insertable = false, updatable = false) private Integer kelasKamarAwalId; - public AntrianPasienDiPeriksa getRegistrasiPelayananPasien() { - return registrasiPelayananPasien; - } - - public void setRegistrasiPelayananPasien(AntrianPasienDiPeriksa registrasiPelayananPasien) { - this.registrasiPelayananPasien = registrasiPelayananPasien; - } - - public String getRegistrasiPelayananPasienId() { - return registrasiPelayananPasienId; - } - - public void setRegistrasiPelayananPasienId(String registrasiPelayananPasienId) { - this.registrasiPelayananPasienId = registrasiPelayananPasienId; - } - - public Date getTglKeluarRencana() { - return tglKeluarRencana; - } - - public void setTglKeluarRencana(Date tglKeluarRencana) { - this.tglKeluarRencana = tglKeluarRencana; - } - - public Integer getStatusKeluarRencanaId() { - return statusKeluarRencanaId; - } - - public void setStatusKeluarRencanaId(Integer statusKeluarRencanaId) { - this.statusKeluarRencanaId = statusKeluarRencanaId; - } - - public Kelas getKelasRencana() { - return kelasRencana; - } - - public void setKelasRencana(Kelas kelasRencana) { - this.kelasRencana = kelasRencana; - } - - public Integer getKelasRencanaId() { - return kelasRencanaId; - } - - public void setKelasRencanaId(Integer kelasRencanaId) { - this.kelasRencanaId = kelasRencanaId; - } - - public Ruangan getRuanganRencana() { - return ruanganRencana; - } - - public void setRuanganRencana(Ruangan ruanganRencana) { - this.ruanganRencana = ruanganRencana; - } - - public Integer getRuanganRencanaId() { - return ruanganRencanaId; - } - - public void setRuanganRencanaId(Integer ruanganRencanaId) { - this.ruanganRencanaId = ruanganRencanaId; - } - - public Kamar getKelasKamarRencana() { - return kelasKamarRencana; - } - - public void setKelasKamarRencana(Kamar kelasKamarRencana) { - this.kelasKamarRencana = kelasKamarRencana; - } - - public Integer getKelasKamarRencanaId() { - return kelasKamarRencanaId; - } - - public void setKelasKamarRencanaId(Integer kelasKamarRencanaId) { - this.kelasKamarRencanaId = kelasKamarRencanaId; - } - - public Integer getNoBedRencana() { - return noBedRencana; - } - - public void setNoBedRencana(Integer noBedRencana) { - this.noBedRencana = noBedRencana; - } - - public String getKeteranganLainya() { - return keteranganLainya; - } - - public void setKeteranganLainya(String keteranganLainya) { - this.keteranganLainya = keteranganLainya; - } - - public Kelas getKelasAwal() { - return kelasAwal; - } - - public void setKelasAwal(Kelas kelasAwal) { - this.kelasAwal = kelasAwal; - } - - public Integer getKelasAwalId() { - return kelasAwalId; - } - - public void setKelasAwalId(Integer kelasAwalId) { - this.kelasAwalId = kelasAwalId; - } - - public Ruangan getRuanganAwal() { - return ruanganAwal; - } - - public void setRuanganAwal(Ruangan ruanganAwal) { - this.ruanganAwal = ruanganAwal; - } - - public Integer getRuanganAwalId() { - return ruanganAwalId; - } - - public void setRuanganAwalId(Integer ruanganAwalId) { - this.ruanganAwalId = ruanganAwalId; - } - - public Kamar getKelasKamarAwal() { - return kelasKamarAwal; - } - - public void setKelasKamarAwal(Kamar kelasKamarAwal) { - this.kelasKamarAwal = kelasKamarAwal; - } - - public Integer getKelasKamarAwalId() { - return kelasKamarAwalId; - } - - public void setKelasKamarAwalId(Integer kelasKamarAwalId) { - this.kelasKamarAwalId = kelasKamarAwalId; - } - - public StatusKeluar getStatusKeluarRencana() { - return statusKeluarRencana; - } - - public void setStatusKeluarRencana(StatusKeluar statusKeluarRencana) { - this.statusKeluarRencana = statusKeluarRencana; - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java index a18caa45..768ddf1d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java @@ -1,20 +1,18 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + +import static javax.persistence.GenerationType.SEQUENCE; + +@Getter +@Setter @Entity @Table(name = "AdvokasiHukumMedicolegal_M") public class AdvokasiHukumMedicolegal extends BaseMaster { @@ -70,114 +68,10 @@ public class AdvokasiHukumMedicolegal extends BaseMaster { @Caption(value = "Status Kasus") private String statusKasus; - public String getNoKasus() { - return noKasus; - } - - public void setNoKasus(String noKasus) { - this.noKasus = noKasus; - } - - public Date getTglKasus() { - return tglKasus; - } - - public void setTglKasus(Date tglKasus) { - this.tglKasus = tglKasus; - } - - public Pegawai getUser() { - return user; - } - - public void setUser(Pegawai user) { - this.user = user; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public JenisKasusMedicolegal getJenisKasus() { - return jenisKasus; - } - - public void setJenisKasus(JenisKasusMedicolegal jenisKasus) { - this.jenisKasus = jenisKasus; - } - - public Integer getJenisKasusId() { - return jenisKasusId; - } - - public void setJenisKasusId(Integer jenisKasusId) { - this.jenisKasusId = jenisKasusId; - } - - public String getAnalisaKajian() { - return analisaKajian; - } - - public void setAnalisaKajian(String analisaKajian) { - this.analisaKajian = analisaKajian; - } - - public String getHasilKeputusan() { - return hasilKeputusan; - } - - public void setHasilKeputusan(String hasilKeputusan) { - this.hasilKeputusan = hasilKeputusan; - } - - public String getStatusKasus() { - return statusKasus; - } - - public void setStatusKasus(String statusKasus) { - this.statusKasus = statusKasus; - } - - public String getDeskripsiKasus() { - return deskripsiKasus; - } - - public void setDeskripsiKasus(String deskripsiKasus) { - this.deskripsiKasus = deskripsiKasus; - } - - public Pegawai getPenanggungJawab() { - return penanggungJawab; - } - - public void setPenanggungJawab(Pegawai penanggungJawab) { - this.penanggungJawab = penanggungJawab; - } - - public Integer getPenanggungJawabId() { - return penanggungJawabId; - } - - public void setPenanggungJawabId(Integer penanggungJawabId) { - this.penanggungJawabId = penanggungJawabId; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq") + @SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java index 508012c8..a7ccb881 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java @@ -1,25 +1,23 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import org.hibernate.envers.Audited; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.GenerationType.SEQUENCE; + +@Getter +@Setter @Entity @Table(name = "Agama_M") @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class Agama extends BaseMaster { - + @NotNull(message = "Agama tidak boleh kosong") @Column(name = "Agama", nullable = false, length = 100) @Caption(value = "Agama") @@ -36,41 +34,9 @@ public class Agama extends BaseMaster { private short qAgama; @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.agama_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.agama_m_id_seq") + @SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public String getAgama() { - return agama; - } - - public void setAgama(String agama) { - this.agama = agama; - } - - public Byte getKdAgama() { - return kdAgama; - } - - public void setKdAgama(Byte kdAgama) { - this.kdAgama = kdAgama; - } - - public short getqAgama() { - return qAgama; - } - - public void setqAgama(short qAgama) { - this.qAgama = qAgama; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java index ab6df1c6..37b0244a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java @@ -1,23 +1,18 @@ package com.jasamedika.medifirst2000.entities; -// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1 +import lombok.Getter; +import lombok.Setter; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.hibernate.envers.Audited; - - - - -@Entity //@Audited +@Getter +@Setter +@Entity @Table(name = "Agama_M_SAMPLE") -public class AgamaM { +public class AgamaM { + @Id protected String idString; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java index ab1f60bb..a690dea3 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java @@ -1,47 +1,29 @@ package com.jasamedika.medifirst2000.entities; -// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1 +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.NotNull; +import java.util.Objects; - +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor @Embeddable public class AgamaMId implements java.io.Serializable { - private short kdProfile; - private byte kdAgama; - - public AgamaMId() { - } - - public AgamaMId(short kdProfile, byte kdAgama) { - this.kdProfile = kdProfile; - this.kdAgama = kdAgama; - } - - @NotNull(message="Kd Profile tidak boleh kosong") + @NotNull(message = "Kd Profile tidak boleh kosong") @Column(name = "KdProfile", nullable = false) - public short getKdProfile() { - return this.kdProfile; - } + private Short kdProfile; - public void setKdProfile(short kdProfile) { - this.kdProfile = kdProfile; - } - - @NotNull(message="Kd Agama tidak boleh kosong") + @NotNull(message = "Kd Agama tidak boleh kosong") @Column(name = "KdAgama", nullable = false) - public byte getKdAgama() { - return this.kdAgama; - } - - public void setKdAgama(byte kdAgama) { - this.kdAgama = kdAgama; - } - - + private Byte kdAgama; @Override public boolean equals(Object obj) { @@ -52,11 +34,9 @@ public class AgamaMId implements java.io.Serializable { if (getClass() != obj.getClass()) return false; AgamaMId other = (AgamaMId) obj; - if (kdAgama != other.kdAgama) + if (!Objects.equals(kdAgama, other.kdAgama)) return false; - if (kdProfile != other.kdProfile) - return false; - return true; + return Objects.equals(kdProfile, other.kdProfile); } @Override @@ -67,6 +47,5 @@ public class AgamaMId implements java.io.Serializable { result = prime * result + kdProfile; return result; } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java index a7958513..f019c79b 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java @@ -22,6 +22,7 @@ import static javax.persistence.GenerationType.SEQUENCE; @Entity @Table(name = "aging_period_m", schema = "mkko") public class AgingPeriod extends BaseActive implements Serializable { + @Id @GeneratedValue(strategy = SEQUENCE, generator = "sg_aging_period_m") @SequenceGenerator(name = "sg_aging_period_m", schema = "mkko", sequenceName = "mkko.aging_period_m_seq", allocationSize = 1) @@ -33,4 +34,5 @@ public class AgingPeriod extends BaseActive implements Serializable { @NotBlank(message = "Period tidak boleh kosong") @Caption("Period") private String period; + } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java index bfc1a4e9..d7a44aaf 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java @@ -1,49 +1,35 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.GenerationType.SEQUENCE; /** * class AkibatHaid * * @author Generator */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "RM_AkibatHaid_M") public class AkibatHaid extends BaseMaster { + @NotNull(message = "Name tidak boleh kosong") @Column(name = "Name", nullable = false, length = 100) @Caption(value = "Name") private String name; - public void setName(String name) { - this.name = name; - } - - public String getName() { - return this.name; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkibatHaid_M_id_seq") - @javax.persistence.SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.AkibatHaid_M_id_seq") + @SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java index 5d3c8208..d6f2c1f4 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java @@ -1,43 +1,28 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.*; + +import static javax.persistence.GenerationType.SEQUENCE; + +@Getter +@Setter @Entity @Table(name = "AkreditasiPelatihan_M") -public class AkreditasiPelatihan extends BaseMaster{ - - @Column(name = "AkreditasiPelatihan", nullable = false , length = 100) +public class AkreditasiPelatihan extends BaseMaster { + + @Column(name = "AkreditasiPelatihan", nullable = false, length = 100) @Caption(value = "AkreditasiPelatihan") - private String akreditasiPelatihan ; + private String akreditasiPelatihan; - public String getAkreditasiPelatihan() { - return akreditasiPelatihan; - } - - public void setAkreditasiPelatihan(String akreditasiPelatihan) { - this.akreditasiPelatihan = akreditasiPelatihan; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq") + @SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java index 01160f68..17931c7d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java @@ -1,17 +1,17 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; import javax.validation.constraints.NotNull; -import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; +import static javax.persistence.GenerationType.SEQUENCE; -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "RM_AktivitasKemandirian_M") public class AktivitasKemandirian extends BaseKeyValueMaster { @@ -20,26 +20,10 @@ public class AktivitasKemandirian extends BaseKeyValueMaster { @Caption(value = "kategori") private String kategori; - public String getKategori() { - return kategori; - } - - public void setKategori(String kategori) { - this.kategori = kategori; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq") - @javax.persistence.SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq") + @SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java index 3d93ade2..75897425 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java @@ -1,16 +1,17 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.GenerationType.SEQUENCE; + +@Getter +@Setter @Entity @Table(name = "Akun_M") public class Akun extends BaseMaster { @@ -22,50 +23,18 @@ public class Akun extends BaseMaster { @NotNull(message = "Kode Akun tidak boleh kosong") @Caption(value = "Kode Akun") - @Column(name = "KodeAkun", nullable = true, length = 50) + @Column(name = "KodeAkun", length = 50) private String kodeAkun; @NotNull(message = "Keterangan tidak boleh kosong") @Caption(value = "Keterangan") - @Column(name = "Keterangan", nullable = true, length = 200) + @Column(name = "Keterangan", length = 200) private String ketAkun; - public String getNamaAkun() { - return namaAkun; - } - - public void setNamaAkun(String namaAkun) { - this.namaAkun = namaAkun; - } - - public String getKodeAkun() { - return kodeAkun; - } - - public void setKodeAkun(String kodeAkun) { - this.kodeAkun = kodeAkun; - } - - public String getKetAkun() { - return ketAkun; - } - - public void setKetAkun(String ketAkun) { - this.ketAkun = ketAkun; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.akun_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.akun_m_id_seq", sequenceName = "public.akun_m_id_seq", allocationSize = 1) + @GeneratedValue(strategy = SEQUENCE, generator = "public.akun_m_id_seq") + @SequenceGenerator(name = "public.akun_m_id_seq", sequenceName = "public.akun_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java index 2824de1e..874807b7 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java @@ -24,6 +24,7 @@ import static javax.persistence.GenerationType.SEQUENCE; @Table(name = "Alamat_M") @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class Alamat extends BaseMaster { + @Id @GeneratedValue(strategy = SEQUENCE, generator = "public.alamat_m_id_seq") @SequenceGenerator(name = "public.alamat_m_id_seq", sequenceName = "public.alamat_m_id_seq", allocationSize = 1) @@ -213,4 +214,5 @@ public class Alamat extends BaseMaster { @Column(name = "YahooMessenger", length = 50) @Caption(value = "Yahoo Messenger") private String yahooMessenger; + } \ No newline at end of file