judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ch-evo-10-01-2024' into 'main'

Browse Source 
Ch evo 10 01 2024

See merge request christianakpona/fiscad!1
This commit is contained in:
Christian AKPONA
2025-01-24 13:23:32 +00:00
parent ee5d158849 f6ad8e4e7d
commit e1dd74b935
39 changed files with 1394 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/gmss/infocad/controllers/rfu/metier/CaracteristiqueBatimentController.java
View File

@@ -2,8 +2,6 @@ package io.gmss.infocad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueBatimentService;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueBatimentService;
import io.gmss.infocad.paylaods.ApiResponse;
import org.springframework.data.domain.PageRequest;

1
src/main/java/io/gmss/infocad/controllers/rfu/metier/EnqueteBatimentController.java
View File

@@ -3,7 +3,6 @@ package io.gmss.infocad.controllers.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.infocad.paylaods.ApiResponse;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;

65
src/main/java/io/gmss/infocad/controllers/synchronisation/SynchronisationController.java
View File

@@ -120,13 +120,74 @@ public class SynchronisationController {
}
@PostMapping(path = "/synchronise/enquete/confirme-from-mobile")
public ResponseEntity<?> syncAllEnqueteData(@RequestBody List<Long> idEnquetes) {
public ResponseEntity<?> syncAllEnqueteData(@RequestBody List<BatimentPaylaod> batimentPaylaods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncEnqueteFromMobile(idEnquetes), "Synchronisation confirmée avec succès."),
new ApiResponse<>(true, synchronisationService.syncBatiment(batimentPaylaods), "Synchronisation confirmée avec succès."),
HttpStatus.OK
);
}
/**
* Liste des API pour la synchronisation des données liées à FISCAD
* Fait le mercredi 15 janvier 2025 à 09h21
* MERCI DE NE PAS TOUCHER A CE BLOC DE CODE
*/
@PostMapping(path = "/batiment")
public ResponseEntity<?> syncBatiment(@RequestBody List<BatimentPaylaod> batimentPaylaods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncBatiment(batimentPaylaods), "Liste des batiments synchronisées avec succès."),
HttpStatus.OK
);
}
@PostMapping(path = "/unite-logement")
public ResponseEntity<?> syncUniteLogement(@RequestBody List<UniteLogementPaylaod> uniteLogementPaylaods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncUniteLogement(uniteLogementPaylaods), "Liste des unités de logement synchronisées avec succès."),
HttpStatus.OK
);
}
@PostMapping(path = "/caracteristique-batiment")
public ResponseEntity<?> syncCaracteristiqueBatiment(@RequestBody List<CaracteristiqueBatimentPaylod> caracteristiqueBatimentPaylods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncCaracteristiqueBatiment(caracteristiqueBatimentPaylods), "Liste des caractéristiques des bâtiments synchronisée avec succès."),
HttpStatus.OK
);
}
@PostMapping(path = "/caracteristique-enquete")
public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(caracteristiqueParcellePaylods), "Liste des caractéristiques des parcelles synchronisée avec succès."),
HttpStatus.OK
);
}
@PostMapping(path = "/caracteristique-unite-logement")
public ResponseEntity<?> syncCaracteristiqueUniteLogement(@RequestBody List<CaracteristiqueUniteLogementPaylod> caracteristiqueUniteLogementPaylods) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncCaracteristiqueUniteLogement(caracteristiqueUniteLogementPaylods), "Liste des caractéristiques des unités de logement synchronisée avec succès."),
HttpStatus.OK
);
}
@PostMapping("/enquete-batiment")
public ResponseEntity<?> syncEnqueteBatiment(@RequestBody List<EnqueteBatimentPayload> enqueteBatimentPayloads) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncEnqueteBatiment(enqueteBatimentPayloads), "Liste des enquêtes des batiments synchronisée avec succès."),
HttpStatus.OK
);
}
@PostMapping("/enquete-unite-logement")
public ResponseEntity<?> syncEnqueteUniteLogement(@RequestBody List<EnqueteUniteLogementPayload> enqueteUniteLogementPayloads) {
return new ResponseEntity<>(
new ApiResponse<>(true, synchronisationService.syncEnqueteUniteLogement(enqueteUniteLogementPayloads), "Liste des enquêtes des unités de logement synchronisée avec succès."),
HttpStatus.OK
);
}
}

6
src/main/java/io/gmss/infocad/entities/infocad/metier/Enquete.java
View File

@@ -12,6 +12,7 @@ import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -145,6 +146,9 @@ public class Enquete extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "enquete")
private List<CaracteristiqueParcelle> caracteristiqueParcelles;
@Enumerated(EnumType.STRING)
@JsonIgnore
private StatutEnregistrement statutEnregistrement;
public Long getTerminalId(){
@@ -189,7 +193,7 @@ public class Enquete extends BaseEntity implements Serializable {
}
public String getArrondissement(){
if(this.bloc!=null){
if(this.bloc!=null) {
Arrondissement arrondissement= this.bloc.getArrondissement();
if(arrondissement!=null){
return arrondissement.getNom();

8
src/main/java/io/gmss/infocad/entities/infocad/metier/Upload.java
View File

@@ -2,8 +2,8 @@ package io.gmss.infocad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.rfu.metier.Batiment;
import io.gmss.infocad.entities.rfu.metier.UniteLogement;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import lombok.Getter;
import lombok.Setter;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
@@ -47,9 +47,9 @@ public class Upload extends BaseEntity implements Serializable {
private Long blocId;
@ManyToOne
private Batiment batiment;
private EnqueteBatiment enqueteBatiment;
@ManyToOne
private UniteLogement uniteLogement;
private EnqueteUniteLogement enqueteUniteLogement;
public Upload() {
}

7
src/main/java/io/gmss/infocad/entities/rfu/metier/Batiment.java
View File

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Parcelle;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -43,7 +43,8 @@ public class Batiment extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "batiment")
private List<UniteLogement> uniteLogements;
@JsonIgnore
@OneToMany(mappedBy = "batiment")
private List<Upload> uploads;
@ManyToOne
private Tpe terminal;
}

5
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueBatiment.java
View File

@@ -1,6 +1,8 @@
package io.gmss.infocad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -32,5 +34,8 @@ public class CaracteristiqueBatiment extends BaseEntity implements Serializable
@ManyToOne
private Caracteristique caracteristique;
private String valeur;
@JsonIgnore
@ManyToOne
private Tpe terminal;
}

5
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueParcelle.java
View File

@@ -1,7 +1,9 @@
package io.gmss.infocad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -33,5 +35,8 @@ public class CaracteristiqueParcelle extends BaseEntity implements Serializable
@ManyToOne
private Caracteristique caracteristique;
private String valeur;
@JsonIgnore
@ManyToOne
private Tpe terminal;
}

5
src/main/java/io/gmss/infocad/entities/rfu/metier/CaracteristiqueUniteLogement.java
View File

@@ -1,6 +1,8 @@
package io.gmss.infocad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.parametre.Caracteristique;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -32,5 +34,8 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ
@ManyToOne
private Caracteristique caracteristique;
private String valeur;
@JsonIgnore
@ManyToOne
private Tpe terminal;
}

19
src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteBatiment.java
View File

@@ -6,7 +6,12 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -64,4 +69,18 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "enqueteBatiment")
List<CaracteristiqueBatiment> caracteristiqueBatiments;
@JsonIgnore
@ManyToOne
private Tpe terminal;
@JsonIgnore
@ManyToOne
private User user;
@Enumerated(EnumType.STRING)
private StatusEnquete statusEnquete;
@JsonIgnore
@OneToMany(mappedBy = "enqueteBatiment")
private List<Upload> uploads;
@Enumerated(EnumType.STRING)
@JsonIgnore
private StatutEnregistrement statutEnregistrement;
}

19
src/main/java/io/gmss/infocad/entities/rfu/metier/EnqueteUniteLogement.java
View File

@@ -6,7 +6,12 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.gmss.infocad.deserializer.LocalDateDeserializer;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.parametre.Personne;
import io.gmss.infocad.entities.user.User;
import io.gmss.infocad.enums.StatusEnquete;
import io.gmss.infocad.enums.StatutEnregistrement;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -63,4 +68,18 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "enqueteUniteLogement")
private List<CaracteristiqueUniteLogement> caracteristiqueUniteLogements;
@JsonIgnore
@ManyToOne
private Tpe terminal;
@JsonIgnore
@ManyToOne
private User user;
@JsonIgnore
@OneToMany(mappedBy = "enqueteUniteLogement")
private List<Upload> uploads;
@JsonIgnore
@Enumerated(EnumType.STRING)
private StatutEnregistrement statutEnregistrement;
@Enumerated(EnumType.STRING)
private StatusEnquete statusEnquete;
}

8
src/main/java/io/gmss/infocad/entities/rfu/metier/UniteLogement.java
View File

@@ -2,7 +2,7 @@ package io.gmss.infocad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,8 +32,8 @@ public class UniteLogement extends BaseEntity implements Serializable {
private List<EnqueteUniteLogement> enqueteUniteLogements;
@ManyToOne
private Batiment batiment;
@JsonIgnore
@OneToMany(mappedBy = "uniteLogement")
private List<Upload> uploads;
private Long idDerniereEnquete;
@JsonIgnore
@ManyToOne
private Tpe terminal;
}

4
src/main/java/io/gmss/infocad/entities/rfu/parametre/Caracteristique.java
View File

@@ -2,6 +2,7 @@ package io.gmss.infocad.entities.rfu.parametre;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.gmss.infocad.entities.BaseEntity;
import io.gmss.infocad.entities.infocad.metier.Tpe;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
import io.gmss.infocad.enums.TypeImmeuble;
@@ -38,6 +39,9 @@ public class Caracteristique extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "caracteristique")
private List<CaracteristiqueUniteLogement> caracteristiqueUniteLogements;
@JsonIgnore
@ManyToOne
private Tpe terminal;
}

6
src/main/java/io/gmss/infocad/enums/StatutEnregistrement.java Normal file
View File

@@ -0,0 +1,6 @@
package io.gmss.infocad.enums;
public enum StatutEnregistrement {
NOUVELLE_INSERTION,
MISE_A_JOUR
}

1
src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java
View File

@@ -4,7 +4,6 @@ import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.infocad.exceptions.BadRequestException;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueParcelleService;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueParcelleService;
import io.gmss.infocad.repositories.rfu.metier.CaracteristiqueParcelleRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

1
src/main/java/io/gmss/infocad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java
View File

@@ -4,7 +4,6 @@ import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
import io.gmss.infocad.exceptions.BadRequestException;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
import io.gmss.infocad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
import io.gmss.infocad.repositories.rfu.metier.CaracteristiqueUniteLogementRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

2
src/main/java/io/gmss/infocad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
View File

@@ -3,9 +3,7 @@ package io.gmss.infocad.implementations.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.exceptions.BadRequestException;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.rfu.metier.BatimentService;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.infocad.repositories.rfu.metier.BatimentRepository;
import io.gmss.infocad.repositories.rfu.metier.EnqueteBatimentRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

3
src/main/java/io/gmss/infocad/implementations/rfu/metier/UniteLogementServiceImpl.java
View File

@@ -1,12 +1,9 @@
package io.gmss.infocad.implementations.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.infocad.entities.rfu.metier.UniteLogement;
import io.gmss.infocad.exceptions.BadRequestException;
import io.gmss.infocad.exceptions.NotFoundException;
import io.gmss.infocad.interfaces.rfu.metier.EnqueteUniteLogementService;
import io.gmss.infocad.interfaces.rfu.metier.UniteLogementService;
import io.gmss.infocad.repositories.rfu.metier.EnqueteUniteLogementRepository;
import io.gmss.infocad.repositories.rfu.metier.UniteLogementRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

1016
src/main/java/io/gmss/infocad/implementations/synchronisation/SynchronisationServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

21
src/main/java/io/gmss/infocad/interfaces/synchronisation/SynchronisationService.java
View File

@@ -13,13 +13,20 @@ import java.util.List;
public interface SynchronisationService {
public UserDecoupageSyncResponses getDecoupageAdminUserConnecter();
public ReferencesSyncResponses getReferencesSyncResponses();
public SyncEnqueteAllDataResponse syncEnqueteAllData(EnqueteAllDataPayload enqueteAllDataPayload );
public List<SyncResponse> syncPersonnes(List<PersonnePayLoad> personnePayLoads );
public List<SyncResponse> syncMembreGroupe(List<MembreGroupePayLoad> membreGroupePayLoads );
public List<SyncResponse> syncEnquete(List<EnquetePayLoad> enquetePayLoads );
public List<SyncResponse> syncParcelle(List<ParcellePayLoad> parcellePayLoads );
public List<SyncResponse> syncPiece(List<PiecePayLoad> piecePayLoads );
public List<SyncResponse> syncActeurConcerne(List<ActeurConcernePayLoad> acteurConcernePayLoads );
public SyncEnqueteAllDataResponse syncEnqueteAllData(EnqueteAllDataPayload enqueteAllDataPayload);
public List<SyncResponse> syncPersonnes(List<PersonnePayLoad> personnePayLoads);
public List<SyncResponse> syncBatiment(List<BatimentPaylaod> batimentPaylaods);
public List<SyncResponse> syncUniteLogement(List<UniteLogementPaylaod> uniteLogementPaylaods);
public List<SyncResponse> syncCaracteristiqueBatiment(List<CaracteristiqueBatimentPaylod> caracteristiqueBatimentPaylods);
public List<SyncResponse> syncCaracteristiqueParcelle(List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods);
public List<SyncResponse> syncCaracteristiqueUniteLogement(List<CaracteristiqueUniteLogementPaylod> caracteristiqueUniteLogementPaylods);
public List<SyncResponse> syncMembreGroupe(List<MembreGroupePayLoad> membreGroupePayLoads);
public List<SyncResponse> syncEnquete(List<EnquetePayLoad> enquetePayLoads);
public List<SyncResponse> syncEnqueteBatiment(List<EnqueteBatimentPayload> enquetebatimentPayLoads);
public List<SyncResponse> syncEnqueteUniteLogement(List<EnqueteUniteLogementPayload> enqueteUniteLogementPayloads);
public List<SyncResponse> syncParcelle(List<ParcellePayLoad> parcellePayLoads);
public List<SyncResponse> syncPiece(List<PiecePayLoad> piecePayLoads);
public List<SyncResponse> syncActeurConcerne(List<ActeurConcernePayLoad> acteurConcernePayLoads);
public SyncResponse syncFiles(MultipartFile file,
Long idBackend,
Long externalKey,

20
src/main/java/io/gmss/infocad/paylaods/request/BatimentPaylaod.java Normal file
View File

@@ -0,0 +1,20 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
import java.time.LocalDate;
@Data
public class BatimentPaylaod {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private String nub;
private String code;
private LocalDate dateConstruction;
private Long parcelleId;
//private Long userId;
private String observation;
}

17
src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueBatimentPaylod.java Normal file
View File

@@ -0,0 +1,17 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
@Data
public class CaracteristiqueBatimentPaylod {
private Long idBackend;
private Long externalKey;
private boolean synchronise;
private Long terminalId;
private Long enqueteBatimentId;
private Long caracteristiqueId;
private String valeur;
//private Long userId;
private String observation;
}

16
src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueParcellePaylod.java Normal file
View File

@@ -0,0 +1,16 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
@Data
public class CaracteristiqueParcellePaylod {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private Long enqueteId;
private Long caracteristiqueId;
private String valeur;
//private Long userId;
private String observation;
}

17
src/main/java/io/gmss/infocad/paylaods/request/CaracteristiqueUniteLogementPaylod.java Normal file
View File

@@ -0,0 +1,17 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
@Data
public class CaracteristiqueUniteLogementPaylod {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private Long enqueteUniteLogementId;
private Long caracteristiqueId;
private String valeur;
//private Long userId;
private String observation;
}

43
src/main/java/io/gmss/infocad/paylaods/request/EnqueteBatimentPayload.java Normal file
View File

@@ -0,0 +1,43 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
import java.time.LocalDate;
@Data
public class EnqueteBatimentPayload {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private String observation;
private float surfaceAuSol;
private String autreMenuisierie;
private String autreMur;
private boolean sbee;
private String numCompteurSbee;
private boolean soneb;
private String numCompteurSoneb;
private byte nbreLotUnite;
private byte nbreUniteLocation;
private float surfaceLouee;
private byte nbreMenage;
private byte nbreHabitant;
private float valeurMensuelleLocation;
private byte nbreMoisLocation;
private String autreCaracteristiquePhysique;
private LocalDate dateDebutExcemption;
private LocalDate dateFinExcemption;
private Long enqueteId;
private Long personneId;
private Long batimentId;
private Long userId;
}

20
src/main/java/io/gmss/infocad/paylaods/request/EnquetePayLoad.java
View File

@@ -10,6 +10,8 @@ import java.time.LocalDate;
public class EnquetePayLoad {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private LocalDate dateEnquete;
private LocalDate dateFinalisation;
private boolean litige;
@@ -22,7 +24,7 @@ public class EnquetePayLoad {
private String observationParticuliere;
private String observation;
private boolean synchronise;
private Long terminalId;
//////////////////
private Long quartierId;
private Long arrondissementId;
@@ -34,4 +36,20 @@ public class EnquetePayLoad {
private String codeEquipe;
private String numeroTitreFoncier;
// Liste des champs ajoutées pour le compte du projet FISCAD
private String numEnterParcelle;
private String numRue;
private String nomRue;
private String emplacement;
private float altitude;
private float precision;
private byte nbreCoProprietaire;
private byte nbreIndivisiaire;
private String autreAdresse;
private String surface;
private byte nbreBatiment;
private byte nbrePiscine;
private LocalDate dateDebutExcemption;
private LocalDate dateFinExcemption;
}

34
src/main/java/io/gmss/infocad/paylaods/request/EnqueteUniteLogementPayload.java Normal file
View File

@@ -0,0 +1,34 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
import java.time.LocalDate;
@Data
public class EnqueteUniteLogementPayload {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private String observation;
private Long userId;
private float surface;
private byte nbrePiece;
private byte nbreHabitant;
private byte nbreMenage;
private boolean enLocation;
private float montantMensuelLoyer;
private byte nbreMoisEnLocation;
private float montantLocatifAnnuelDeclare;
private float surfaceLouee;
private boolean sbee;
private boolean soneb;
private String numCompteurSbee;
private String numCompteurSoneb;
private LocalDate dateDebutExcemption;
private LocalDate dateFinExcemption;
private Long enqueteId;
private Long uniteLogementId;
private Long personneId;
}

4
src/main/java/io/gmss/infocad/paylaods/request/ParcellePayLoad.java
View File

@@ -5,6 +5,8 @@ import lombok.Data;
public class ParcellePayLoad {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private String q;
private String nup;
private String nupProvisoire;
@@ -17,7 +19,7 @@ public class ParcellePayLoad {
private String p;
private boolean synchronise;
private String observation;
private Long terminalId;
private String numTitreFoncier;
/////////////////////////////////

17
src/main/java/io/gmss/infocad/paylaods/request/UniteLogementPaylaod.java Normal file
View File

@@ -0,0 +1,17 @@
package io.gmss.infocad.paylaods.request;
import lombok.Data;
@Data
public class UniteLogementPaylaod {
private Long idBackend;
private Long externalKey;
private Long terminalId;
private boolean synchronise;
private String nul;
private String numeroEtage;
private String code;
private Long batimentId;
//private Long userId;
private String observation;
}

15
src/main/java/io/gmss/infocad/paylaods/response/restoration/EnquetePayLoad.java
View File

@@ -39,4 +39,19 @@ public interface EnquetePayLoad {
public String getCodeEquipe();
public String getNumeroTitreFoncier();
public String getNumEnterParcelle();
public String getNumRue();
public String getNomRue();
public String getEmplacement();
public float getAltitude();
public float getPrecision();
public byte getNbreCoProprietaire();
public byte getNbreIndivisiaire();
public String getAutreAdresse();
public String getSurface();
public byte getNbreBatiment();
public byte getNbrePiscine();
public LocalDate getDateDebutExcemption();
public LocalDate getDateFinExcemption();
}

5
src/main/java/io/gmss/infocad/repositories/infocad/metier/UploadRepository.java
View File

@@ -1,6 +1,8 @@
package io.gmss.infocad.repositories.infocad.metier;
import io.gmss.infocad.entities.infocad.metier.Upload;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.infocad.paylaods.response.restoration.UploadPayLoad;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
@@ -38,5 +40,8 @@ public interface UploadRepository extends JpaRepository<Upload, Long> {
,nativeQuery = true)
List<UploadPayLoad> getUploadByTerminalId(Long terminalId);
void deleteAllByEnqueteBatiment(EnqueteBatiment enqueteBatiment);
void deleteAllByEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement);
/////////////////////////////////
}

4
src/main/java/io/gmss/infocad/repositories/rfu/metier/BatimentRepository.java
View File

@@ -3,6 +3,10 @@ package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.Batiment;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface BatimentRepository extends JpaRepository<Batiment, Long> {
Optional<Batiment> findFirstByExternalKeyAndTerminal_Id(Long externalKey,Long TerminalId);
}

2
src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueBatimentRepository.java
View File

@@ -1,8 +1,10 @@
package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import org.springframework.data.jpa.repository.JpaRepository;
public interface CaracteristiqueBatimentRepository extends JpaRepository<CaracteristiqueBatiment, Long> {
void deleteAllByEnqueteBatiment(EnqueteBatiment enqueteBatiment);
}

3
src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueParcelleRepository.java
View File

@@ -1,8 +1,11 @@
package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.infocad.metier.Enquete;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueParcelle;
import org.springframework.data.jpa.repository.JpaRepository;
public interface CaracteristiqueParcelleRepository extends JpaRepository<CaracteristiqueParcelle, Long> {
void deleteAllByEnquete(Enquete enquete);
}

2
src/main/java/io/gmss/infocad/repositories/rfu/metier/CaracteristiqueUniteLogementRepository.java
View File

@@ -1,8 +1,10 @@
package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.CaracteristiqueUniteLogement;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import org.springframework.data.jpa.repository.JpaRepository;
public interface CaracteristiqueUniteLogementRepository extends JpaRepository<CaracteristiqueUniteLogement, Long> {
void deleteAllByEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement);
}

4
src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteBatimentRepository.java
View File

@@ -3,6 +3,10 @@ package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteBatiment;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment, Long> {
Optional<EnqueteBatiment> findFirstByExternalKeyAndTerminal_Id(Long externalKey,Long TerminalId);
}

3
src/main/java/io/gmss/infocad/repositories/rfu/metier/EnqueteUniteLogementRepository.java
View File

@@ -3,6 +3,9 @@ package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.EnqueteUniteLogement;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUniteLogement, Long> {
Optional<EnqueteUniteLogement> findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId);
}

3
src/main/java/io/gmss/infocad/repositories/rfu/metier/UniteLogementRepository.java
View File

@@ -3,6 +3,9 @@ package io.gmss.infocad.repositories.rfu.metier;
import io.gmss.infocad.entities.rfu.metier.UniteLogement;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface UniteLogementRepository extends JpaRepository<UniteLogement, Long> {
Optional<UniteLogement> findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId);
}

1
src/main/java/io/gmss/infocad/repositories/rfu/parametre/CaracteristiqueRepository.java
View File

@@ -9,4 +9,5 @@ import java.util.List;
public interface CaracteristiqueRepository extends JpaRepository<Caracteristique, Long> {
List<Caracteristique> findAllByActifIsTrue();
//Optional<Caracteristique> findFirstByExternalKeyAndTerminal_Id(Long externalKey, Long TerminalId);
}