-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JPE - Ajout du message "Capture d'espèces protégées" (CPS) (#2768)
## Linked issues - Resolve #2765. - Resolve #2769 ---- - [x] Pipeline : mise à jour du parser ERS - [x] Back et front : affichage des données de type `log_type=CPS` - [ ] Rajouter nom entier de l'engin dans le payload de réponse API
- Loading branch information
Showing
100 changed files
with
3,400 additions
and
3,309 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/logbook/ProtectedSpeciesCatch.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package fr.gouv.cnsp.monitorfish.domain.entities.logbook | ||
|
||
import com.fasterxml.jackson.annotation.JsonTypeName | ||
|
||
@JsonTypeName("protectedSpeciesCatch") | ||
class ProtectedSpeciesCatch { | ||
lateinit var species: String | ||
var speciesName: String? = null | ||
var sex: String? = null | ||
var healthState: HealthState? = null | ||
var careMinutes: Int? = null | ||
var ring: Int? = null | ||
var fate: Fate? = null | ||
var comment: String? = null | ||
var weight: Double? = null | ||
var nbFish: Double? = null | ||
var faoZone: String? = null | ||
var economicZone: String? = null | ||
var statisticalRectangle: String? = null | ||
var effortZone: String? = null | ||
} | ||
|
||
enum class HealthState { | ||
DEA, | ||
ALI, | ||
INJ, | ||
} | ||
|
||
enum class Fate { | ||
DIS, | ||
HEC, | ||
DEA, | ||
} |
16 changes: 16 additions & 0 deletions
16
backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/logbook/messages/CPS.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package fr.gouv.cnsp.monitorfish.domain.entities.logbook.messages | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty | ||
import fr.gouv.cnsp.monitorfish.domain.entities.logbook.ProtectedSpeciesCatch | ||
import java.time.ZonedDateTime | ||
|
||
class CPS : LogbookMessageValue { | ||
@JsonProperty("cpsDatetimeUtc") | ||
var cpsDatetime: ZonedDateTime? = null | ||
var latitude: Double? = null | ||
var longitude: Double? = null | ||
var gear: String? = null | ||
var mesh: Double? = null | ||
var dimensions: String? = null | ||
var catches: List<ProtectedSpeciesCatch> = listOf() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.