develop #67

Merged
judaur2005 merged 2 commits from develop into main 2025-12-20 18:56:24 +00:00
3 changed files with 16 additions and 5 deletions
Showing only changes of commit 7f18f22efb - Show all commits

View File

@@ -1,6 +1,7 @@
package io.gmss.fiscad.entities.infocad.metier; package io.gmss.fiscad.entities.infocad.metier;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -62,14 +63,23 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private StatutParcelle statutParcelle; private StatutParcelle statutParcelle;
private Long uploadId; private Long uploadId;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Departement departement; private Departement departement;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Commune commune; private Commune commune;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Arrondissement arrondissement; private Arrondissement arrondissement;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Quartier quartier ; private Quartier quartier ;
@ColumnDefault("0") @ColumnDefault("0")
private int geomSrid; private int geomSrid;
@JsonSerialize(using = GeometrySerializer.class) @JsonSerialize(using = GeometrySerializer.class)

View File

@@ -51,6 +51,7 @@ public class Piece extends BaseEntity implements Serializable {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
private Personne personne; private Personne personne;
private Long personneExternalKey; private Long personneExternalKey;
@JsonIgnore @JsonIgnore
@JsonBackReference @JsonBackReference
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)

View File

@@ -44,7 +44,7 @@ logging.file.name=/app/logs/fiscad.log
#app.abs.env.defaultpassword = 1234567890 #app.abs.env.defaultpassword = 1234567890
#app.abs.env.defaultuser = infocad_admin #app.abs.env.defaultuser = fiscad_admin
app.default-user.username=${DEFAULT_USER_NAME} app.default-user.username=${DEFAULT_USER_NAME}
app.default-user.password=${DEFAULT_USER_PASSWORD} app.default-user.password=${DEFAULT_USER_PASSWORD}