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

traitement updload geom

Browse Source
This commit is contained in:
AKAKPO Aurince
2025-04-21 14:45:02 +01:00
parent 8a3c4ce5c2
commit e1ef4c3b7e
8 changed files with 3008 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java
View File

@@ -70,17 +70,18 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
@Enumerated(EnumType.STRING)
//@ColumnDefault("NON_ENQUETER")
private StatutParcelle statutParcelle;
///@JsonIgnore
@ManyToOne
private Upload upload;
////////////
@OneToOne
private Parcelle parcelle;
// @JsonIgnore
// @OneToOne
// private Parcelle parcelle;
@ManyToOne
private Quartier quartier;

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

@@ -53,9 +53,6 @@ public class Upload extends BaseEntity implements Serializable {
@Transient
private int nombreParcelleGeom;
@JsonIgnore
@OneToMany(mappedBy = "upload")
private List<ParcelleGeom> parcelleGeoms ;
@JsonIgnore
@ManyToOne
@@ -90,12 +87,12 @@ public class Upload extends BaseEntity implements Serializable {
}
public int getNombreParcelleGeom(){
if(parcelleGeoms!=null){
return parcelleGeoms.size();
}else {
return 0;
}
}
// public int getNombreParcelleGeom(){
// if(parcelleGeoms!=null){
// return parcelleGeoms.size();
// }else {
// return 0;
// }
//
// }
}

54
src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java
View File

@@ -92,19 +92,19 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
JsonNode propertiesNode = feature.get("properties");
WKTReader wktReader = new WKTReader();
if (geometryNode != null) {
Polygon geometry = null;
try {
geometry = convertGeoJsonToPolygon(geometryNode.toString());
} catch (ParseException e) {
e.printStackTrace();
//throw new RuntimeException(e);
} catch (Exception e) {
e.printStackTrace();
// throw new RuntimeException(e);
}
// Polygon geometry = null;
// try {
// geometry = convertGeoJsonToPolygon(geometryNode.toString());
// } catch (ParseException e) {
// e.printStackTrace();
// //throw new RuntimeException(e);
// } catch (Exception e) {
// e.printStackTrace();
// // throw new RuntimeException(e);
// }
ParcelleGeom parcelleGeom = new ParcelleGeom();
parcelleGeom.setUpload(upload);
parcelleGeom.setGeometry(geometry);
// parcelleGeom.setGeometry(geometry);
parcelleGeom.setDepartement(propertiesNode.get("DEPARTEMENT").textValue());
parcelleGeom.setCommune(propertiesNode.get("COMMUNE").textValue());
parcelleGeom.setArrondissement(propertiesNode.get("ARRONDISSEMENT").textValue());
@@ -175,22 +175,22 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
@Override
public void setStatutParcelleGeom(String nupProvisoir) {
Optional<ParcelleGeom> optionalParcelleGeom=parcelleGeomRepository.findFirstByNupProvisoire(nupProvisoir);
Optional<Enquete> enqueteOptional=enqueteRepository.getEnquetByNupProvisoir(nupProvisoir);
if(enqueteOptional.isEmpty()){
if(!optionalParcelleGeom.isEmpty()){
optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.NON_ENQUETER);
}
}else {
if(!optionalParcelleGeom.isEmpty()){
if(enqueteOptional.get().getEnqueteBatiments()!=null && !enqueteOptional.get().getEnqueteBatiments().isEmpty()) {
optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.ENQUETER_BATIE);
}else{
optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.ENQUETER_NON_BATIE);
}
}
}
// Optional<Enquete> enqueteOptional=enqueteRepository.getEnquetByNupProvisoir(nupProvisoir);
//
// if(enqueteOptional.isEmpty()){
// if(!optionalParcelleGeom.isEmpty()){
// optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.NON_ENQUETER);
// }
// }else {
// if(!optionalParcelleGeom.isEmpty()){
// if(enqueteOptional.get().getEnqueteBatiments()!=null && !enqueteOptional.get().getEnqueteBatiments().isEmpty()) {
// optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.ENQUETER_BATIE);
// }else{
// optionalParcelleGeom.get().setStatutParcelle(StatutParcelle.ENQUETER_NON_BATIE);
// }
// }
//
// }
}

1
src/main/java/io/gmss/fiscad/repositories/infocad/metier/ParcelleGeomRepository.java
View File

@@ -21,5 +21,6 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
"and upper(parcelle_geom.commune)=upper(T.nom_commune) ",nativeQuery = true)
void majIdQuartier();
Optional<ParcelleGeom> findFirstByNupProvisoire(String nupProvisoir);
}