This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2f18a591bfb13ea11f2bf8c1940da6550853a7a7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 25 18:28:40 2014 +0200 fixes #5850 [IMPORT PUPITRI] vérifier que l'import s'assure que le n° station ET la date des fichiers .tnk et .car soient en cohérence avec le trait dans Tutti --- .../fr/ifremer/tutti/service/pupitri/CarrouselRow.java | 14 ++++++++------ .../ifremer/tutti/service/pupitri/CarrouselRowModel.java | 5 +++-- .../java/fr/ifremer/tutti/service/pupitri/TrunkRow.java | 14 ++++++++------ .../fr/ifremer/tutti/service/pupitri/TrunkRowModel.java | 5 +++-- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java index dacadee..d0d0ced 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java @@ -23,8 +23,10 @@ package fr.ifremer.tutti.service.pupitri; */ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import org.apache.commons.lang3.time.DateUtils; import java.io.Serializable; +import java.util.Date; /** * @author kmorin <kmorin@codelutin.com> @@ -60,7 +62,7 @@ public class CarrouselRow implements Serializable { protected String operationCode; - protected String rigNumber; + protected Date date; protected String speciesId; @@ -72,7 +74,7 @@ public class CarrouselRow implements Serializable { public boolean acceptOperation(FishingOperation operation) { return operationCode.equals(operation.getStationNumber()) - && rigNumber.equals(operation.getMultirigAggregation()); + && DateUtils.isSameDay(date, operation.getGearShootingStartDate()); } public String getOperationCode() { @@ -83,12 +85,12 @@ public class CarrouselRow implements Serializable { this.operationCode = operationCode; } - public String getRigNumber() { - return rigNumber; + public Date getDate() { + return date; } - public void setRigNumber(String rigNumber) { - this.rigNumber = rigNumber; + public void setDate(Date date) { + this.date = date; } public String getSpeciesId() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java index b186dd0..4816e9c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java @@ -23,6 +23,7 @@ package fr.ifremer.tutti.service.pupitri; */ import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.csv.Common; import org.nuiton.csv.ValueParser; import java.text.ParseException; @@ -37,7 +38,7 @@ public class CarrouselRowModel extends TuttiCsvUtil.ImportModelWithHeader<Carrou super(separator); newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE); - newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER); + newMandatoryColumn(CarrouselRow.PROPERTY_DATE, new Common.DateValue("dd/MM/yy")); newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID); newMandatoryColumn(CarrouselRow.PROPERTY_SIGN, new ValueParser<Signs>() { @@ -57,7 +58,7 @@ public class CarrouselRowModel extends TuttiCsvUtil.ImportModelWithHeader<Carrou TuttiCsvUtil.WEIGHT_PARSER_FORMATTER); newIgnoredColumn(CarrouselRow.PROPERTY_FILE_ORIGIN); - newIgnoredColumn(CarrouselRow.PROPERTY_DATE); + newIgnoredColumn(CarrouselRow.PROPERTY_RIG_NUMBER); newIgnoredColumn(CarrouselRow.PROPERTY_TIME); newIgnoredColumn(CarrouselRow.PROPERTY_BALANCE_ID); newIgnoredColumn(CarrouselRow.PROPERTY_TO_CONFIRM); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java index cda1db0..85d1003 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java @@ -23,8 +23,10 @@ package fr.ifremer.tutti.service.pupitri; */ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import org.apache.commons.lang3.time.DateUtils; import java.io.Serializable; +import java.util.Date; /** * @author kmorin <kmorin@codelutin.com> @@ -56,7 +58,7 @@ public class TrunkRow implements Serializable { protected String operationCode; - protected String rigNumber; + protected Date date; protected Directions direction; @@ -64,7 +66,7 @@ public class TrunkRow implements Serializable { public boolean acceptOperation(FishingOperation operation) { return operationCode.equals(operation.getStationNumber()) - && rigNumber.equals(operation.getMultirigAggregation()); + && DateUtils.isSameDay(date, operation.getGearShootingStartDate()); } public String getOperationCode() { @@ -75,12 +77,12 @@ public class TrunkRow implements Serializable { this.operationCode = operationCode; } - public String getRigNumber() { - return rigNumber; + public Date getDate() { + return date; } - public void setRigNumber(String rigNumber) { - this.rigNumber = rigNumber; + public void setDate(Date date) { + this.date = date; } public Directions getDirection() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java index 3df7958..5d1835a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java @@ -23,6 +23,7 @@ package fr.ifremer.tutti.service.pupitri; */ import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.csv.Common; /** * @author kmorin <kmorin@codelutin.com> @@ -34,7 +35,7 @@ public class TrunkRowModel extends TuttiCsvUtil.ImportModelWithHeader<TrunkRow> super(separator); newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE); - newMandatoryColumn(TrunkRow.PROPERTY_RIG_NUMBER); + newMandatoryColumn(TrunkRow.PROPERTY_DATE, new Common.DateValue("dd/MM/yy")); newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, TuttiCsvUtil.newEnumByNameParserFormatter(Directions.class)); newMandatoryColumn(TrunkRow.PROPERTY_WEIGHT, @@ -42,7 +43,7 @@ public class TrunkRowModel extends TuttiCsvUtil.ImportModelWithHeader<TrunkRow> newIgnoredColumn(TrunkRow.PROPERTY_SIGN); newIgnoredColumn(TrunkRow.PROPERTY_FILE_ORIGIN); - newIgnoredColumn(TrunkRow.PROPERTY_DATE); + newIgnoredColumn(TrunkRow.PROPERTY_RIG_NUMBER); newIgnoredColumn(TrunkRow.PROPERTY_TIME); newIgnoredColumn(TrunkRow.PROPERTY_BALANCE_ID); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.