diff --git a/csv_parser/models/model.xlsx b/csv_parser/models/model.xlsx index 005961637c..7dc4da85c4 100644 Binary files a/csv_parser/models/model.xlsx and b/csv_parser/models/model.xlsx differ diff --git a/csv_parser/out/EMSI/EMSI.schema.docx b/csv_parser/out/EMSI/EMSI.schema.docx index 9d0b51a695..3d188f4f71 100644 Binary files a/csv_parser/out/EMSI/EMSI.schema.docx and b/csv_parser/out/EMSI/EMSI.schema.docx differ diff --git a/csv_parser/out/EMSI/EMSI.uml_diagram.pdf b/csv_parser/out/EMSI/EMSI.uml_diagram.pdf index 900f738a04..140e98a4ae 100644 Binary files a/csv_parser/out/EMSI/EMSI.uml_diagram.pdf and b/csv_parser/out/EMSI/EMSI.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-POS/GEO-POS.schema.docx b/csv_parser/out/GEO-POS/GEO-POS.schema.docx index 2e31e500b4..5a87beef46 100644 Binary files a/csv_parser/out/GEO-POS/GEO-POS.schema.docx and b/csv_parser/out/GEO-POS/GEO-POS.schema.docx differ diff --git a/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf b/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf index 788b40e1e5..2906f3d07b 100644 Binary files a/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf and b/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx b/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx index 95400eb142..bac659e912 100644 Binary files a/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx and b/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx differ diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf b/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf index 2e456001cc..00f7124079 100644 Binary files a/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf and b/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-RES/GEO-RES.schema.docx b/csv_parser/out/GEO-RES/GEO-RES.schema.docx index a2aa503c52..ea69fbcb5d 100644 Binary files a/csv_parser/out/GEO-RES/GEO-RES.schema.docx and b/csv_parser/out/GEO-RES/GEO-RES.schema.docx differ diff --git a/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf b/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf index 11e06e3d47..e6bda5839d 100644 Binary files a/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf and b/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-DE/RC-DE.schema.docx b/csv_parser/out/RC-DE/RC-DE.schema.docx index dfe9c69e95..baacdd7dc2 100644 Binary files a/csv_parser/out/RC-DE/RC-DE.schema.docx and b/csv_parser/out/RC-DE/RC-DE.schema.docx differ diff --git a/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf b/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf index a764ca3c10..4138e1a397 100644 Binary files a/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf and b/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-EDA/RC-EDA.schema.docx b/csv_parser/out/RC-EDA/RC-EDA.schema.docx index 6c778bb8f3..000fa473b5 100644 Binary files a/csv_parser/out/RC-EDA/RC-EDA.schema.docx and b/csv_parser/out/RC-EDA/RC-EDA.schema.docx differ diff --git a/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf b/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf index 1dee7d6923..4615b8c5b4 100644 Binary files a/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf and b/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-REF/RC-REF.schema.docx b/csv_parser/out/RC-REF/RC-REF.schema.docx index 03f70dd042..9c6dcb90a5 100644 Binary files a/csv_parser/out/RC-REF/RC-REF.schema.docx and b/csv_parser/out/RC-REF/RC-REF.schema.docx differ diff --git a/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf b/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf index 8c439adac6..c145bdef58 100644 Binary files a/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf and b/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-RI/RC-RI.example.json b/csv_parser/out/RC-RI/RC-RI.example.json index a784d4a982..ce2c3903dc 100644 --- a/csv_parser/out/RC-RI/RC-RI.example.json +++ b/csv_parser/out/RC-RI/RC-RI.example.json @@ -5,7 +5,7 @@ "datetime": "2022-09-27T08:23:34+02:00", "resourceId": "fr.health.samu770.resource.VLM250\nfr.health.samu440.resource.DRFR15DDXAAJJJ0000.1", "requestId": "fr.health.samu770.request.1249875\nfr.health.samu690.request.DRFR15690242370035.3", - "missionId": "DRFR15DDXAAJJJ0000.M001", + "operationId": "DRFR15DDXAAJJJ0000.M001", "orgId": "fr.health.samu440", "centerName": "CHU Nantes", "vehicleType": "SMUR", diff --git a/csv_parser/out/RC-RI/RC-RI.input.csv b/csv_parser/out/RC-RI/RC-RI.input.csv index bec68ca1d5..ad2f5fc749 100644 --- a/csv_parser/out/RC-RI/RC-RI.input.csv +++ b/csv_parser/out/RC-RI/RC-RI.input.csv @@ -17,7 +17,7 @@ fr.health.samu440.resource.DRFR15DDXAAJJJ0000.1",resourceId,1..1,,string,"REGEX: OU - si un ID unique de la demande n'était pas disponible : {OrgId émetteur}.request.{senderCaseId}.{numéro d’ordre chronologique}","fr.health.samu770.request.1249875 fr.health.samu690.request.DRFR15690242370035.3",requestId,0..1,,string,"REGEX: ^([a-zA-Z0-9_-]+\.){3,8}request(\.[a-zA-Z0-9_-]+){1,2}$" -,ID Mission local,,,,,"A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) qui a déclenché le vecteur",DRFR15DDXAAJJJ0000.M001,missionId,0..1,,string, +,ID Opération,,,,,"A valoriser avec le numéro d'opération unique du central d’appel (PSAP, …) qui a déclenché le vecteur",DRFR15DDXAAJJJ0000.M001,operationId,0..1,,string, ,ID Organisation propriétaire,,,,,"A valoriser avec l'identifiant de l'organisation à laquelle appartient la ressource, normé comme suit : {pays}.{domaine}.{organisation}",fr.health.samu440,orgId,0..1,,string, ,Nom du centre d’affectation,,,,,A valoriser avec le lieu de garage principal,CHU Nantes,centerName,0..1,,string, diff --git a/csv_parser/out/RC-RI/RC-RI.schema.docx b/csv_parser/out/RC-RI/RC-RI.schema.docx index c5ff5adc6f..0eed551ec9 100644 Binary files a/csv_parser/out/RC-RI/RC-RI.schema.docx and b/csv_parser/out/RC-RI/RC-RI.schema.docx differ diff --git a/csv_parser/out/RC-RI/RC-RI.uml_diagram b/csv_parser/out/RC-RI/RC-RI.uml_diagram index 2028c84255..a418d798ae 100644 --- a/csv_parser/out/RC-RI/RC-RI.uml_diagram +++ b/csv_parser/out/RC-RI/RC-RI.uml_diagram @@ -42,7 +42,7 @@ strict digraph { resource - objet resourcedatetime date-time : [1..1] resourceId string : [1..1] requestId string : [0..1] missionId string : [0..1] orgId string : [0..1] centerName string : [0..1] vehicleType string : [1..1] name string : [0..1] centerCity string : [0..1] freetext string : [0..*] + objet resourcedatetime date-time : [1..1] resourceId string : [1..1] requestId string : [0..1] operationId string : [0..1] orgId string : [0..1] centerName string : [0..1] vehicleType string : [1..1] name string : [0..1] centerCity string : [0..1] freetext string : [0..*] >] resource -> resourcesInfoCisu [headlabel=1 taillabel="1..*"] resourcesInfoCisu [label=< diff --git a/csv_parser/out/RC-RI/RC-RI.uml_diagram.pdf b/csv_parser/out/RC-RI/RC-RI.uml_diagram.pdf index a186065ff4..02f7a3f691 100644 Binary files a/csv_parser/out/RC-RI/RC-RI.uml_diagram.pdf and b/csv_parser/out/RC-RI/RC-RI.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-BPV/RS-BPV.schema.docx b/csv_parser/out/RS-BPV/RS-BPV.schema.docx index 1261389ec9..2e83b27b5c 100644 Binary files a/csv_parser/out/RS-BPV/RS-BPV.schema.docx and b/csv_parser/out/RS-BPV/RS-BPV.schema.docx differ diff --git a/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf b/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf index 03f3052733..bb61cf7e66 100644 Binary files a/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf and b/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-DR/RS-DR.schema.docx b/csv_parser/out/RS-DR/RS-DR.schema.docx index d5777b2e49..3a809eb703 100644 Binary files a/csv_parser/out/RS-DR/RS-DR.schema.docx and b/csv_parser/out/RS-DR/RS-DR.schema.docx differ diff --git a/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf b/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf index c791cdda74..ad9fcd1e7c 100644 Binary files a/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf and b/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx index 26ff46cb36..09aaa2c0cb 100644 Binary files a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx and b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx differ diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf index e9e00e4e9f..23607b91b2 100644 Binary files a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf and b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-EDA/RS-EDA.schema.docx b/csv_parser/out/RS-EDA/RS-EDA.schema.docx index 6c4d9c282f..97eb407748 100644 Binary files a/csv_parser/out/RS-EDA/RS-EDA.schema.docx and b/csv_parser/out/RS-EDA/RS-EDA.schema.docx differ diff --git a/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf b/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf index e18add605e..1fe43503c7 100644 Binary files a/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf and b/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-ER/RS-ER.schema.docx b/csv_parser/out/RS-ER/RS-ER.schema.docx index 477660d13d..4fe3dbfee6 100644 Binary files a/csv_parser/out/RS-ER/RS-ER.schema.docx and b/csv_parser/out/RS-ER/RS-ER.schema.docx differ diff --git a/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf b/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf index eddf1abaeb..c212f1df69 100644 Binary files a/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf and b/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx b/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx index 28e1dc1eaf..734ed20f57 100644 Binary files a/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx and b/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx differ diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf b/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf index 332e398e4b..3392336818 100644 Binary files a/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf and b/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RI/RS-RI.schema.docx b/csv_parser/out/RS-RI/RS-RI.schema.docx index ec8326ffce..d15d58a0dd 100644 Binary files a/csv_parser/out/RS-RI/RS-RI.schema.docx and b/csv_parser/out/RS-RI/RS-RI.schema.docx differ diff --git a/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf b/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf index 3c5c9332ba..407a13a3d0 100644 Binary files a/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf and b/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx b/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx index ec78fb8fab..f78d61afc6 100644 Binary files a/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx and b/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx differ diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf b/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf index 0fbc5dc275..1a48f612f3 100644 Binary files a/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf and b/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RR/RS-RR.schema.docx b/csv_parser/out/RS-RR/RS-RR.schema.docx index a7a90abb8a..ba9464c910 100644 Binary files a/csv_parser/out/RS-RR/RS-RR.schema.docx and b/csv_parser/out/RS-RR/RS-RR.schema.docx differ diff --git a/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf b/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf index fd46456891..65b6951d93 100644 Binary files a/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf and b/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.schema.docx b/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.schema.docx index 1f1a609a0d..0ecefac484 100644 Binary files a/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.schema.docx and b/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.schema.docx differ diff --git a/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.uml_diagram.pdf b/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.uml_diagram.pdf index 7a0a4b3660..3179e534cd 100644 Binary files a/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.uml_diagram.pdf and b/csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-SR/RS-SR.schema.docx b/csv_parser/out/RS-SR/RS-SR.schema.docx index df7e251e79..87aac384cb 100644 Binary files a/csv_parser/out/RS-SR/RS-SR.schema.docx and b/csv_parser/out/RS-SR/RS-SR.schema.docx differ diff --git a/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf b/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf index a8b4d34a4e..235fabdff8 100644 Binary files a/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf and b/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-URL/RS-URL.schema.docx b/csv_parser/out/RS-URL/RS-URL.schema.docx index 992c8a46a7..45d524f67a 100644 Binary files a/csv_parser/out/RS-URL/RS-URL.schema.docx and b/csv_parser/out/RS-URL/RS-URL.schema.docx differ diff --git a/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf b/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf index 1b7445b351..be166ceec4 100644 Binary files a/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf and b/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf differ diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx b/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx index 17ee56ed52..167054a284 100644 Binary files a/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx and b/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx differ diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf b/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf index b36e9bbe31..c268c68936 100644 Binary files a/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf and b/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf differ diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx index db276146f4..4a5f4d0d66 100644 Binary files a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx and b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx differ diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf index b2861bffc2..75a1ac4f0f 100644 Binary files a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf and b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf differ diff --git a/csv_parser/out/customContent/customContent.schema.docx b/csv_parser/out/customContent/customContent.schema.docx index 7649bff2d7..a21a9ca6bb 100644 Binary files a/csv_parser/out/customContent/customContent.schema.docx and b/csv_parser/out/customContent/customContent.schema.docx differ diff --git a/csv_parser/out/customContent/customContent.uml_diagram.pdf b/csv_parser/out/customContent/customContent.uml_diagram.pdf index 1d0a5bfbfb..f442dae0a5 100644 Binary files a/csv_parser/out/customContent/customContent.uml_diagram.pdf and b/csv_parser/out/customContent/customContent.uml_diagram.pdf differ diff --git a/generator/input/RC-RI.openapi.yaml b/generator/input/RC-RI.openapi.yaml index f87c701109..7b102365e7 100644 --- a/generator/input/RC-RI.openapi.yaml +++ b/generator/input/RC-RI.openapi.yaml @@ -99,13 +99,13 @@ components: - 'fr.health.samu770.request.1249875 fr.health.samu690.request.DRFR15690242370035.3' - missionId: + operationId: type: string - title: ID Mission local + title: "ID Op\xE9ration" x-health-only: false x-cols: 6 - example: example.json#/resource/0/missionId - description: "A valoriser avec le num\xE9ro de mission unique du central\ + example: example.json#/resource/0/operationId + description: "A valoriser avec le num\xE9ro d'op\xE9ration unique du central\ \ d\u2019appel (PSAP, \u2026) qui a d\xE9clench\xE9 le vecteur" examples: - DRFR15DDXAAJJJ0000.M001 diff --git a/src/main/java/com/hubsante/model/cisu/resources/info/Resource.java b/src/main/java/com/hubsante/model/cisu/resources/info/Resource.java index 219e25d183..fbc0ce4391 100644 --- a/src/main/java/com/hubsante/model/cisu/resources/info/Resource.java +++ b/src/main/java/com/hubsante/model/cisu/resources/info/Resource.java @@ -50,7 +50,7 @@ */ @JsonPropertyOrder( {Resource.JSON_PROPERTY_DATETIME, Resource.JSON_PROPERTY_RESOURCE_ID, - Resource.JSON_PROPERTY_REQUEST_ID, Resource.JSON_PROPERTY_MISSION_ID, + Resource.JSON_PROPERTY_REQUEST_ID, Resource.JSON_PROPERTY_OPERATION_ID, Resource.JSON_PROPERTY_ORG_ID, Resource.JSON_PROPERTY_CENTER_NAME, Resource.JSON_PROPERTY_VEHICLE_TYPE, Resource.JSON_PROPERTY_NAME, Resource.JSON_PROPERTY_CENTER_CITY, Resource.JSON_PROPERTY_TEAM, @@ -69,8 +69,8 @@ public class Resource { public static final String JSON_PROPERTY_REQUEST_ID = "requestId"; private String requestId; - public static final String JSON_PROPERTY_MISSION_ID = "missionId"; - private String missionId; + public static final String JSON_PROPERTY_OPERATION_ID = "operationId"; + private String operationId; public static final String JSON_PROPERTY_ORG_ID = "orgId"; private String orgId; @@ -215,28 +215,28 @@ public void setRequestId(String requestId) { this.requestId = requestId; } - public Resource missionId(String missionId) { + public Resource operationId(String operationId) { - this.missionId = missionId; + this.operationId = operationId; return this; } /** - * A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) - *qui a déclenché le vecteur - * @return missionId + * A valoriser avec le numéro d'opération unique du central d’appel (PSAP, + *…) qui a déclenché le vecteur + * @return operationId **/ - @JsonProperty(JSON_PROPERTY_MISSION_ID) + @JsonProperty(JSON_PROPERTY_OPERATION_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getMissionId() { - return missionId; + public String getOperationId() { + return operationId; } - @JsonProperty(JSON_PROPERTY_MISSION_ID) + @JsonProperty(JSON_PROPERTY_OPERATION_ID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMissionId(String missionId) { - this.missionId = missionId; + public void setOperationId(String operationId) { + this.operationId = operationId; } public Resource orgId(String orgId) { @@ -499,7 +499,7 @@ public boolean equals(Object o) { return Objects.equals(this.datetime, resource.datetime) && Objects.equals(this.resourceId, resource.resourceId) && Objects.equals(this.requestId, resource.requestId) && - Objects.equals(this.missionId, resource.missionId) && + Objects.equals(this.operationId, resource.operationId) && Objects.equals(this.orgId, resource.orgId) && Objects.equals(this.centerName, resource.centerName) && Objects.equals(this.vehicleType, resource.vehicleType) && @@ -514,7 +514,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(datetime, resourceId, requestId, missionId, orgId, + return Objects.hash(datetime, resourceId, requestId, operationId, orgId, centerName, vehicleType, name, centerCity, team, state, position, contact, freetext); } @@ -530,8 +530,8 @@ public String toString() { sb.append(" requestId: ") .append(toIndentedString(requestId)) .append("\n"); - sb.append(" missionId: ") - .append(toIndentedString(missionId)) + sb.append(" operationId: ") + .append(toIndentedString(operationId)) .append("\n"); sb.append(" orgId: ").append(toIndentedString(orgId)).append("\n"); sb.append(" centerName: ") diff --git a/src/main/resources/json-schema/EMSI.schema.json b/src/main/resources/json-schema/EMSI.schema.json index 50abf67f8d..80f3bf1a5d 100644 --- a/src/main/resources/json-schema/EMSI.schema.json +++ b/src/main/resources/json-schema/EMSI.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "EMSI.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "emsi", diff --git a/src/main/resources/json-schema/GEO-POS.schema.json b/src/main/resources/json-schema/GEO-POS.schema.json index 60cabd5ff7..a9022093ee 100644 --- a/src/main/resources/json-schema/GEO-POS.schema.json +++ b/src/main/resources/json-schema/GEO-POS.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "GEO-POS.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "geoPositionsUpdate", diff --git a/src/main/resources/json-schema/GEO-REQ.schema.json b/src/main/resources/json-schema/GEO-REQ.schema.json index 4ea52db04d..9393fac5fb 100644 --- a/src/main/resources/json-schema/GEO-REQ.schema.json +++ b/src/main/resources/json-schema/GEO-REQ.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "GEO-REQ.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "geoResourcesRequest", diff --git a/src/main/resources/json-schema/GEO-RES.schema.json b/src/main/resources/json-schema/GEO-RES.schema.json index 753b411b9b..9b4c99eb8b 100644 --- a/src/main/resources/json-schema/GEO-RES.schema.json +++ b/src/main/resources/json-schema/GEO-RES.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "GEO-RES.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "geoResourcesDetails", diff --git a/src/main/resources/json-schema/RC-DE.schema.json b/src/main/resources/json-schema/RC-DE.schema.json index af5e57c2ea..8efa64d7e3 100644 --- a/src/main/resources/json-schema/RC-DE.schema.json +++ b/src/main/resources/json-schema/RC-DE.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RC-DE.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "distributionElement", diff --git a/src/main/resources/json-schema/RC-EDA.schema.json b/src/main/resources/json-schema/RC-EDA.schema.json index 31379c826d..d1c574c938 100644 --- a/src/main/resources/json-schema/RC-EDA.schema.json +++ b/src/main/resources/json-schema/RC-EDA.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RC-EDA.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "createCase", diff --git a/src/main/resources/json-schema/RC-REF.schema.json b/src/main/resources/json-schema/RC-REF.schema.json index 50f957e9f1..cb1ad31b69 100644 --- a/src/main/resources/json-schema/RC-REF.schema.json +++ b/src/main/resources/json-schema/RC-REF.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RC-REF.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "reference", diff --git a/src/main/resources/json-schema/RC-RI.schema.json b/src/main/resources/json-schema/RC-RI.schema.json index 0119882fa5..bb61850aba 100644 --- a/src/main/resources/json-schema/RC-RI.schema.json +++ b/src/main/resources/json-schema/RC-RI.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RC-RI.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesInfoCisu", @@ -69,13 +69,13 @@ "description": "A valoriser avec l'identifiant unique partagé de la demande de ressource (si la ressource a été engagée suite à une demande de ressource), normé comme suit :\n{orgID}.request.{ID unique de la demande dans le système émetteur}\nOU - si un ID unique de la demande n'était pas disponible : \n{OrgId émetteur}.request.{senderCaseId}.{numéro d’ordre chronologique}", "pattern": "^([a-zA-Z0-9_-]+\\.){3,8}request(\\.[a-zA-Z0-9_-]+){1,2}$" }, - "missionId": { + "operationId": { "type": "string", - "title": "ID Mission local", + "title": "ID Opération", "x-health-only": false, "x-cols": 6, - "example": "example.json#/resource/0/missionId", - "description": "A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) qui a déclenché le vecteur" + "example": "example.json#/resource/0/operationId", + "description": "A valoriser avec le numéro d'opération unique du central d’appel (PSAP, …) qui a déclenché le vecteur" }, "orgId": { "type": "string", diff --git a/src/main/resources/json-schema/RS-BPV.schema.json b/src/main/resources/json-schema/RS-BPV.schema.json index 1d634f7279..0fa4f08591 100644 --- a/src/main/resources/json-schema/RS-BPV.schema.json +++ b/src/main/resources/json-schema/RS-BPV.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-BPV.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "interventionReport", diff --git a/src/main/resources/json-schema/RS-DR.schema.json b/src/main/resources/json-schema/RS-DR.schema.json index 41da76da47..efeb08968a 100644 --- a/src/main/resources/json-schema/RS-DR.schema.json +++ b/src/main/resources/json-schema/RS-DR.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-DR.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesRequest", diff --git a/src/main/resources/json-schema/RS-EDA-MAJ.schema.json b/src/main/resources/json-schema/RS-EDA-MAJ.schema.json index 04aca717b3..c6015f4201 100644 --- a/src/main/resources/json-schema/RS-EDA-MAJ.schema.json +++ b/src/main/resources/json-schema/RS-EDA-MAJ.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-EDA-MAJ.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "createCaseHealthUpdate", diff --git a/src/main/resources/json-schema/RS-EDA.schema.json b/src/main/resources/json-schema/RS-EDA.schema.json index 4aae79710e..fe896349b1 100644 --- a/src/main/resources/json-schema/RS-EDA.schema.json +++ b/src/main/resources/json-schema/RS-EDA.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-EDA.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "createCaseHealth", diff --git a/src/main/resources/json-schema/RS-ER.schema.json b/src/main/resources/json-schema/RS-ER.schema.json index 3ce657cc36..5ffe692ffc 100644 --- a/src/main/resources/json-schema/RS-ER.schema.json +++ b/src/main/resources/json-schema/RS-ER.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-ER.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesEngagement", diff --git a/src/main/resources/json-schema/RS-ERROR.schema.json b/src/main/resources/json-schema/RS-ERROR.schema.json index 42974c024c..703e44afde 100644 --- a/src/main/resources/json-schema/RS-ERROR.schema.json +++ b/src/main/resources/json-schema/RS-ERROR.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-ERROR.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "error", diff --git a/src/main/resources/json-schema/RS-RI.schema.json b/src/main/resources/json-schema/RS-RI.schema.json index d9b41399a1..21e718e6bb 100644 --- a/src/main/resources/json-schema/RS-RI.schema.json +++ b/src/main/resources/json-schema/RS-RI.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-RI.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesInfo", diff --git a/src/main/resources/json-schema/RS-RPIS.schema.json b/src/main/resources/json-schema/RS-RPIS.schema.json index f61416befb..66009b9938 100644 --- a/src/main/resources/json-schema/RS-RPIS.schema.json +++ b/src/main/resources/json-schema/RS-RPIS.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-RPIS.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "rpis", diff --git a/src/main/resources/json-schema/RS-RR.schema.json b/src/main/resources/json-schema/RS-RR.schema.json index 196eb4216e..85307c461f 100644 --- a/src/main/resources/json-schema/RS-RR.schema.json +++ b/src/main/resources/json-schema/RS-RR.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-RR.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesResponse", diff --git a/src/main/resources/json-schema/RS-SAS-RDV.schema.json b/src/main/resources/json-schema/RS-SAS-RDV.schema.json index b10ab6afe5..878c861dbe 100644 --- a/src/main/resources/json-schema/RS-SAS-RDV.schema.json +++ b/src/main/resources/json-schema/RS-SAS-RDV.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-SAS-RDV.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "appointment", diff --git a/src/main/resources/json-schema/RS-SR.schema.json b/src/main/resources/json-schema/RS-SR.schema.json index 460a227585..8b208fe2e9 100644 --- a/src/main/resources/json-schema/RS-SR.schema.json +++ b/src/main/resources/json-schema/RS-SR.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-SR.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "resourcesStatus", diff --git a/src/main/resources/json-schema/RS-URL.schema.json b/src/main/resources/json-schema/RS-URL.schema.json index fd286198b4..048b3e1cca 100644 --- a/src/main/resources/json-schema/RS-URL.schema.json +++ b/src/main/resources/json-schema/RS-URL.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "RS-URL.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "documentLink", diff --git a/src/main/resources/json-schema/TECHNICAL.schema.json b/src/main/resources/json-schema/TECHNICAL.schema.json index fefc2956d1..ff149ba5f2 100644 --- a/src/main/resources/json-schema/TECHNICAL.schema.json +++ b/src/main/resources/json-schema/TECHNICAL.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "TECHNICAL.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "technical", diff --git a/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json b/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json index 50f8394aa9..12eca2cb37 100644 --- a/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json +++ b/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "TECHNICAL_NOREQ.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "technicalNoreq", diff --git a/src/main/resources/json-schema/customContent.schema.json b/src/main/resources/json-schema/customContent.schema.json index cab0bc49ab..0a39251b0c 100644 --- a/src/main/resources/json-schema/customContent.schema.json +++ b/src/main/resources/json-schema/customContent.schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "classpath:/json-schema/schema#", "x-id": "customContent.schema.json#", - "version": "26.03.23", + "version": "26.04.28", "example": "example.json#", "type": "object", "title": "customContent", diff --git a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.json b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.json index 837d0e5b51..72d08f606a 100644 --- a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.json +++ b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.json @@ -15,7 +15,8 @@ "status": "DECLENCHE", "datetime": "2024-05-18T18:10:00+02:00", "availability": false - } + }, + "operationId": "DRFR15DDXAAJJJ0000.M001" }, { "team": { @@ -31,7 +32,8 @@ "status": "DECLENCHE", "datetime": "2024-05-18T18:20:00+02:00", "availability": false - } + }, + "operationId": "DRFR15DDXAAJJJ0000.M001" } ], "caseId": "fr.health.samu440.DRFR154402413800236" diff --git a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.xml b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.xml index a783dbb584..63d21c0632 100644 --- a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.xml +++ b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.xml @@ -4,6 +4,7 @@ 2024-05-18T18:22:00+02:00 fr.health.samu440.resource.VLM1 + DRFR15DDXAAJJJ0000.M001 fr.health.samu440 SMUR VLM1 @@ -20,6 +21,7 @@ 2024-05-18T18:22:00+02:00 fr.health.samu440.resource.VLM2 + DRFR15DDXAAJJJ0000.M001 fr.health.samu440 SMUR VLM2 diff --git a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.json b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.json index 064c71f4e1..f2379b8056 100644 --- a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.json +++ b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.json @@ -20,7 +20,8 @@ }, "freetext": [ "Eric AZERTY, Marie-Jo ANELI, Pierre LOUITUT" - ] + ], + "operationId": "DRFR15DDXAAJJJ0000.M001" } ], "caseId": "fr.health.samu440.DRFR154402413800236" diff --git a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.xml b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.xml index 236a02b947..3b48fc509a 100644 --- a/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.xml +++ b/src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.05.xml @@ -4,6 +4,7 @@ 2024-05-18T18:20:00+02:00 fr.fire.sis044.cgo-044.resource.VSAV2 + DRFR15DDXAAJJJ0000.M001 fr.fire.sdis44.cgo-044 SIS VSAV2 diff --git a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.json b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.json index 8c322f4b8f..cdf799b6e9 100644 --- a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.json +++ b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.json @@ -22,7 +22,8 @@ }, "freetext": [ "Eric AZERTY, Marie-Jo ANELI, Pierre LOUITUT" - ] + ], + "missionId": "DRFR15DDXAAJJJ0000.M001" } ], "caseId": "fr.health.samu440.DRFR154402413800236" diff --git a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.xml b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.xml index 6e00ac3df8..62c5de539b 100644 --- a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.xml +++ b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.03.xml @@ -4,6 +4,7 @@ 2024-05-18T18:20:00+02:00 fr.health.samu440.resource.VLM2 + DRFR15DDXAAJJJ0000.M001 fr.health.samu440 SMUR.VLM VLM2 diff --git a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.json b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.json index cd714941d4..2e5420ce45 100644 --- a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.json +++ b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.json @@ -21,7 +21,8 @@ "datetime": "2024-05-18T18:19:00+02:00", "status": "DECISION" } - ] + ], + "missionId": "DRFR15DDXAAJJJ0000.M001" }, { "team": { @@ -32,7 +33,8 @@ "orgId": "fr.fire.sdis044.cgo-044", "vehicleType": "SIS.VSAV", "name": "VSAV3", - "centerCity": "44109" + "centerCity": "44109", + "missionId": "DRFR15DDXAAJJJ0000.M001" } ], "caseId": "fr.health.samu440.DRFR154402413800236" diff --git a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.xml b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.xml index 64175d48ac..3a6e3e8c52 100644 --- a/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.xml +++ b/src/main/resources/sample/examples/RS-RI/RS-RI_FuiteDeGaz_AliceGregoireNORMAND.06.xml @@ -4,6 +4,7 @@ 2024-05-18T18:20:00+02:00 fr.health.samu440.resource.VLM2 + DRFR15DDXAAJJJ0000.M001 fr.health.samu440 SMUR.VLM VLM2 @@ -24,6 +25,7 @@ 2024-05-18T18:22:00+02:00 fr.fire.sis044.cgo-044.resource.VSAV3 + DRFR15DDXAAJJJ0000.M001 fr.fire.sdis044.cgo-044 SIS.VSAV VSAV3 diff --git a/src/main/resources/xsd/RC-RI.xsd b/src/main/resources/xsd/RC-RI.xsd index 97de256a82..0e3b7dbbda 100644 --- a/src/main/resources/xsd/RC-RI.xsd +++ b/src/main/resources/xsd/RC-RI.xsd @@ -53,9 +53,9 @@ OU - si un ID unique de la demande n'était pas disponible : - + - A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) qui a déclenché le vecteur + A valoriser avec le numéro d'opération unique du central d’appel (PSAP, …) qui a déclenché le vecteur