This commit is contained in:
clement.bouillot 2021-10-20 08:19:26 +02:00
parent 1062bf48b2
commit 0704ab7cd2

View File

@ -7,73 +7,32 @@ import java.util.Objects;
/** /**
* *
* @author Dominique_2 * @author Clément B
*/ */
public class Pompier { public class Pompier {
private int id; private int id;
private String civilite; private int idCaserne;
private String nom; private String nom;
private String prenom; private String prenom;
private String statut;
private int typePers;
private String mail;
private String login;
private String mdp; private String mdp;
private int adrNo; private String adresse;
private String adrRue; private String cp;
private String adrVille; private String ville;
private String adrCP; private int bip;
private String adrmail; private int nbGardes;
private String tel; private int grade;
private String dateNais; private String commentaire;
private String dateEnreg;
private String dateModif;
private int idEquipe;
public Pompier() { public Pompier() {
} }
/**
* Constructeur entier
* @param id
* @param civilite
* @param nom
* @param prenom
* @param mdp
* @param adrNo
* @param adrRue
* @param adrVille
* @param adrCP
* @param adrmail
* @param tel
* @param dateNais
*/
public Pompier(int id, String civilite, String nom, String prenom, String mdp, int adrNo, String adrRue, String adrVille, String adrCP, String adrmail, String tel, String dateNais) {
this(civilite, nom, prenom, mdp, adrNo, adrRue, adrVille, adrCP, adrmail, tel, dateNais);
this.id = id;
}
/**
* Constructeur sans id
* @param civilite
* @param nom
* @param prenom
* @param mdp
* @param adrNo
* @param adrRue
* @param adrVille
* @param adrCP
* @param adrmail
* @param tel
* @param dateNais
*/
public Pompier(String civilite, String nom, String prenom, String mdp, int adrNo, String adrRue, String adrVille, String adrCP, String adrmail, String tel, String dateNais) {
this.civilite = civilite;
this.nom = nom;
this.prenom = prenom;
this.mdp = mdp;
this.adrNo = adrNo;
this.adrRue = adrRue;
this.adrVille = adrVille;
this.adrCP = adrCP;
this.adrmail = adrmail;
this.tel = tel;
this.dateNais = dateNais;
}
public int getId() { public int getId() {
return id; return id;
} }
@ -82,12 +41,12 @@ public class Pompier {
this.id = id; this.id = id;
} }
public String getCivilite() { public int getIdCaserne() {
return civilite; return idCaserne;
} }
public void setCivilite(String civilite) { public void setIdCaserne(int idCaserne) {
this.civilite = civilite; this.idCaserne = idCaserne;
} }
public String getNom() { public String getNom() {
@ -106,6 +65,38 @@ public class Pompier {
this.prenom = prenom; this.prenom = prenom;
} }
public String getStatut() {
return statut;
}
public void setStatut(String statut) {
this.statut = statut;
}
public int getTypePers() {
return typePers;
}
public void setTypePers(int typePers) {
this.typePers = typePers;
}
public String getMail() {
return mail;
}
public void setMail(String mail) {
this.mail = mail;
}
public String getLogin() {
return login;
}
public void setLogin(String login) {
this.login = login;
}
public String getMdp() { public String getMdp() {
return mdp; return mdp;
} }
@ -114,77 +105,108 @@ public class Pompier {
this.mdp = mdp; this.mdp = mdp;
} }
public int getAdrNo() { public String getAdresse() {
return adrNo; return adresse;
} }
public void setAdrNo(int adrNo) { public void setAdresse(String adresse) {
this.adrNo = adrNo; this.adresse = adresse;
} }
public String getAdrRue() { public String getCp() {
return adrRue; return cp;
} }
public void setAdrRue(String adrRue) { public void setCp(String cp) {
this.adrRue = adrRue; this.cp = cp;
} }
public String getAdrVille() { public String getVille() {
return adrVille; return ville;
} }
public void setAdrVille(String adrVille) { public void setVille(String dateNais) {
this.adrVille = adrVille; this.ville = dateNais;
} }
public String getAdrCP() { public int getBip() {
return adrCP; return bip;
} }
public void setAdrCP(String adrCP) { public void setBip(int bip) {
this.adrCP = adrCP; this.bip = bip;
} }
public String getAdrmail() { public int getNbGardes() {
return adrmail; return nbGardes;
} }
public void setAdrmail(String adrmail) { public void setNbGardes(int nbGardes) {
this.adrmail = adrmail; this.nbGardes = nbGardes;
} }
public String getTel() { public int getGrade() {
return tel; return grade;
} }
public void setTel(String tel) { public void setGrade(int grade) {
this.tel = tel; this.grade = grade;
} }
public String getDateNais() { public String getCommentaire() {
return dateNais; return commentaire;
} }
public void setDateNais(String dateNais) { public void setCommentaire(String commentaire) {
this.dateNais = dateNais; this.commentaire = commentaire;
}
public String getDateEnreg() {
return dateEnreg;
}
public void setDateEnreg(String dateEnreg) {
this.dateEnreg = dateEnreg;
}
public String getDateModif() {
return dateModif;
}
public void setDateModif(String dateModif) {
this.dateModif = dateModif;
}
public int getIdEquipe() {
return idEquipe;
}
public void setIdEquipe(int idEquipe) {
this.idEquipe = idEquipe;
} }
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 5; int hash = 7;
hash = 17 * hash + this.id; hash = 59 * hash + this.id;
hash = 17 * hash + Objects.hashCode(this.civilite); hash = 59 * hash + Objects.hashCode(this.idCaserne);
hash = 17 * hash + Objects.hashCode(this.nom); hash = 59 * hash + Objects.hashCode(this.nom);
hash = 17 * hash + Objects.hashCode(this.prenom); hash = 59 * hash + Objects.hashCode(this.prenom);
hash = 17 * hash + Objects.hashCode(this.mdp); hash = 59 * hash + Objects.hashCode(this.statut);
hash = 17 * hash + this.adrNo; hash = 59 * hash + this.typePers;
hash = 17 * hash + Objects.hashCode(this.adrRue); hash = 59 * hash + Objects.hashCode(this.mail);
hash = 17 * hash + Objects.hashCode(this.adrVille); hash = 59 * hash + Objects.hashCode(this.login);
hash = 17 * hash + Objects.hashCode(this.adrCP); hash = 59 * hash + Objects.hashCode(this.mdp);
hash = 17 * hash + Objects.hashCode(this.adrmail); hash = 59 * hash + Objects.hashCode(this.adresse);
hash = 17 * hash + Objects.hashCode(this.tel); hash = 59 * hash + Objects.hashCode(this.cp);
hash = 17 * hash + Objects.hashCode(this.dateNais); hash = 59 * hash + Objects.hashCode(this.ville);
hash = 59 * hash + Objects.hashCode(this.bip);
hash = 59 * hash + this.nbGardes;
hash = 59 * hash + this.grade;
hash = 59 * hash + Objects.hashCode(this.commentaire);
hash = 59 * hash + Objects.hashCode(this.dateEnreg);
hash = 59 * hash + Objects.hashCode(this.dateModif);
hash = 59 * hash + this.idEquipe;
return hash; return hash;
} }
@ -203,10 +225,19 @@ public class Pompier {
if (this.id != other.id) { if (this.id != other.id) {
return false; return false;
} }
if (this.adrNo != other.adrNo) { if (this.typePers != other.typePers) {
return false; return false;
} }
if (!Objects.equals(this.civilite, other.civilite)) { if (this.nbGardes != other.nbGardes) {
return false;
}
if (this.grade != other.grade) {
return false;
}
if (this.idEquipe != other.idEquipe) {
return false;
}
if (!Objects.equals(this.idCaserne, other.idCaserne)) {
return false; return false;
} }
if (!Objects.equals(this.nom, other.nom)) { if (!Objects.equals(this.nom, other.nom)) {
@ -215,25 +246,37 @@ public class Pompier {
if (!Objects.equals(this.prenom, other.prenom)) { if (!Objects.equals(this.prenom, other.prenom)) {
return false; return false;
} }
if (!Objects.equals(this.statut, other.statut)) {
return false;
}
if (!Objects.equals(this.mail, other.mail)) {
return false;
}
if (!Objects.equals(this.login, other.login)) {
return false;
}
if (!Objects.equals(this.mdp, other.mdp)) { if (!Objects.equals(this.mdp, other.mdp)) {
return false; return false;
} }
if (!Objects.equals(this.adrRue, other.adrRue)) { if (!Objects.equals(this.adresse, other.adresse)) {
return false; return false;
} }
if (!Objects.equals(this.adrVille, other.adrVille)) { if (!Objects.equals(this.cp, other.cp)) {
return false; return false;
} }
if (!Objects.equals(this.adrCP, other.adrCP)) { if (!Objects.equals(this.ville, other.ville)) {
return false; return false;
} }
if (!Objects.equals(this.adrmail, other.adrmail)) { if (!Objects.equals(this.bip, other.bip)) {
return false; return false;
} }
if (!Objects.equals(this.tel, other.tel)) { if (!Objects.equals(this.commentaire, other.commentaire)) {
return false; return false;
} }
if (!Objects.equals(this.dateNais, other.dateNais)) { if (!Objects.equals(this.dateEnreg, other.dateEnreg)) {
return false;
}
if (!Objects.equals(this.dateModif, other.dateModif)) {
return false; return false;
} }
return true; return true;
@ -241,7 +284,8 @@ public class Pompier {
@Override @Override
public String toString() { public String toString() {
return "Client{" + "id=" + id + ", civilite=" + civilite + ", nom=" + nom + ", prenom=" + prenom + ", mdp=" + mdp + ", adrNo=" + adrNo + ", adrRue=" + adrRue + ", adrVille=" + adrVille + ", adrCP=" + adrCP + ", adrmail=" + adrmail + ", tel=" + tel + ", dateNais=" + dateNais + '}'; return "Pompier{" + "id=" + id + ", idCaserne=" + idCaserne + ", nom=" + nom + ", prenom=" + prenom + ", statut=" + statut + ", typePers=" + typePers + ", mail=" + mail + ", login=" + login + ", mdp=" + mdp + ", adresse=" + adresse + ", cp=" + cp + ", ville=" + ville + ", bip=" + bip + ", nbGardes=" + nbGardes + ", grade=" + grade + ", commentaire=" + commentaire + ", dateEnreg=" + dateEnreg + ", dateModif=" + dateModif + ", idEquipe=" + idEquipe + '}';
} }
} }