This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit f4a020edc4a5b45537ea6711a5d02c026ad71b63 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 22:06:43 2015 +0100 add caracteristic type in fishing operation parameters import/export --- .../service/genericformat/csv/ParameterModel.java | 4 ++ .../service/genericformat/csv/ParameterRow.java | 54 ++++++++++++++++++++-- .../producer/CsvProducerForParameter.java | 11 +++-- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java index 9ca5d3d..b43eea7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -58,6 +59,7 @@ public class ParameterModel extends AbstractTuttiImportExportModel<ParameterRow> ParameterRow row = new ParameterRow(); row.setCruise(Cruises.newCruise()); + row.setFishingOperation(FishingOperations.newFishingOperation()); return row; } @@ -80,6 +82,7 @@ public class ParameterModel extends AbstractTuttiImportExportModel<ParameterRow> newColumnForExport("Libelle_PMFM", ParameterRow.PROPERTY_CARACTERISTIC, TuttiCsvUtil.CARACTERISTIC_FORMATTER); newColumnForExport("Valeur", ParameterRow.PROPERTY_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); + newColumnForExport("Type", ParameterRow.PROPERTY_PARAMETER_TYPE, TuttiCsvUtil.newEnumByNameParserFormatter(ParameterRow.ParameterType.class)); newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); newColumnForExport("Valeur_Id", ParameterRow.PROPERTY_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_TECHNICAL_FORMATTER); @@ -99,6 +102,7 @@ public class ParameterModel extends AbstractTuttiImportExportModel<ParameterRow> newIgnoredColumn("Libelle_PMFM"); newIgnoredColumn("Valeur"); + newMandatoryColumn("Type", ParameterRow.PROPERTY_PARAMETER_TYPE, TuttiCsvUtil.newEnumByNameParserFormatter(ParameterRow.ParameterType.class)); newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); newMandatoryColumn("Valeur_Id", ParameterRow.PROPERTY_VALUE); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java index b9f87e1..6357bbe 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java @@ -40,19 +40,31 @@ public class ParameterRow implements Serializable { private static final long serialVersionUID = 1L; + public static enum ParameterType { + GEAR, + VESSEL + } + public static final String PROPERTY_CARACTERISTIC = "caracteristic"; public static final String PROPERTY_VALUE = "value"; + public static final String PROPERTY_PARAMETER_TYPE = "parameterType"; - protected Cruise cruise; + private Cruise cruise; - protected FishingOperation fishingOperation; + private FishingOperation fishingOperation; - protected Caracteristic caracteristic; + private Caracteristic caracteristic; private Serializable value; + private ParameterType parameterType; + + public void setParameterType(ParameterType parameterType) { + this.parameterType = parameterType; + } + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -69,6 +81,42 @@ public class ParameterRow implements Serializable { this.value = value; } + public void setSurveyPart(String surveyPart) { + cruise.setSurveyPart(surveyPart); + } + + public void setBeginDate(Date beginDate) { + cruise.setBeginDate(beginDate); + } + + public void setProgram(Program program) { + cruise.setProgram(program); + } + + public void setStationNumber(String stationNumber) { + fishingOperation.setStationNumber(stationNumber); + } + + public void setFishingOperationNumber(Integer fishingOperationNumber) { + fishingOperation.setFishingOperationNumber(fishingOperationNumber); + } + + public void setMultirigAggregation(String multirigAggregation) { + fishingOperation.setMultirigAggregation(multirigAggregation); + } + + public ParameterType getParameterType() { + return parameterType; + } + + public Cruise getCruise() { + return cruise; + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + public Date getBeginDate() { return cruise.getBeginDate(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java index b3b1c49..1f8b2ed 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java @@ -32,23 +32,28 @@ public class CsvProducerForParameter extends CsvProducer<ParameterRow, Parameter CaracteristicMap gearUseFeatures = operation.getGearUseFeatures(); if (gearUseFeatures != null) { - addCaracteristicMap(rows, cruise, operation, gearUseFeatures); + addCaracteristicMap(rows, cruise, operation, ParameterRow.ParameterType.GEAR, gearUseFeatures); } CaracteristicMap vesselUseFeatures = operation.getVesselUseFeatures(); if (vesselUseFeatures != null) { - addCaracteristicMap(rows, cruise, operation, vesselUseFeatures); + addCaracteristicMap(rows, cruise, operation, ParameterRow.ParameterType.VESSEL, vesselUseFeatures); } return rows; } - protected void addCaracteristicMap(List<ParameterRow> rows, Cruise cruise, FishingOperation operation, CaracteristicMap caracteristicMap) { + protected void addCaracteristicMap(List<ParameterRow> rows, + Cruise cruise, + FishingOperation operation, + ParameterRow.ParameterType parameterType, + CaracteristicMap caracteristicMap) { for (Map.Entry<Caracteristic, Serializable> entry : caracteristicMap.entrySet()) { ParameterRow row = new ParameterRow(); + row.setParameterType(parameterType); row.setCruise(cruise); row.setFishingOperation(operation); row.setCaracteristic(entry.getKey()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.