Author: tchemit Date: 2013-05-22 10:23:24 +0200 (Wed, 22 May 2013) New Revision: 977 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/977 Log: refs #2474: [TECHN] Gestion des logs : info trac?\195?\169es fixes #2457: [CAMPAGNE] Probl?\195?\168me changement de responsable de campagne non pris en compte fixes #2446: [CAMPAGNE] Le responsable salle de tri n'est pas sauvegard?\195?\169 fixes #2450: [TRAIT] Doublon en tant que saisisseur Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -116,8 +116,8 @@ target.setSpecies(species); entityToBenthosBatch(source, target); result.addChildren(target); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); } } } @@ -141,8 +141,8 @@ entityToBenthosBatch(source, target); result.addChildren(target); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); } } } @@ -388,8 +388,8 @@ BenthosBatch targetChild = TuttiBeanFactory.newBenthosBatch(); targetChild.setSpecies(target.getSpecies()); entityToBenthosBatch(sourceChild, targetChild); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -966,17 +966,18 @@ if (CollectionUtils.isNotEmpty(source.getRecorderPerson())) { for (Person person : source.getRecorderPerson()) { Integer personId = person.getIdAsInt(); - vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures(vesselPersonFeaturesMap, - personId, - target, - recorderPersonRole); + vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures( + vesselPersonFeaturesMap, + personId, + target, + recorderPersonRole); } } - if (fishingTrip.getVesselPersonFeatures() == null) { - fishingTrip.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet()); + if (target.getVesselPersonFeatures() == null) { + target.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet()); } - fishingTrip.getVesselPersonFeatures().clear(); - fishingTrip.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values()); + target.getVesselPersonFeatures().clear(); + target.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values()); // Comment target.setComments(source.getComment()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -38,7 +38,6 @@ import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; @@ -430,8 +429,8 @@ SpeciesBatch targetChild = TuttiBeanFactory.newSpeciesBatch(); targetChild.setSpecies(target.getSpecies()); entityToSpeciesBatch(sourceChild, targetChild); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild); @@ -480,8 +479,6 @@ Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); - boolean createEntity = TuttiEntities.isNew(source); - Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977) @@ -24,14 +24,19 @@ * #L% */ +import fr.ifremer.adagio.core.dao.administration.user.Person; import fr.ifremer.adagio.core.dao.administration.user.PersonImpl; import fr.ifremer.adagio.core.dao.data.operation.FishingOperation; import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip; import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeatures; +import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeaturesDao; import fr.ifremer.adagio.core.dao.referential.VesselPersonRole; import fr.ifremer.adagio.core.dao.referential.VesselPersonRoleImpl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Date; import java.util.Map; @@ -44,6 +49,13 @@ @Component("vesselPersonFeaturesPersistenceHelper") public class VesselPersonFeaturesPersistenceHelper extends AbstractPersistenceService { + /** Logger. */ + private static final Log log = + LogFactory.getLog(VesselPersonFeaturesPersistenceHelper.class); + + @Resource(name = "vesselPersonFeaturesDao") + protected VesselPersonFeaturesDao vesselPersonFeaturesDao; + public VesselPersonFeaturesPersistenceHelper() { } @@ -67,23 +79,30 @@ VesselPersonFeatures vesselPersonFeatures = vesselPersonFeaturesPerPerson.get(personId); if (vesselPersonFeatures == null) { + + PersonImpl person = load(PersonImpl.class, personId); + + if (log.isDebugEnabled()) { + log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname()); + } + vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance(); vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures); - } + vesselPersonFeatures.setPerson(person); - PersonImpl person = load(PersonImpl.class, personId); - vesselPersonFeatures.setFishingTrip(fishingTrip); - vesselPersonFeatures.setPerson(person); - vesselPersonFeatures.getVesselPersonRoles().add(role); + vesselPersonFeatures.setFishingTrip(fishingTrip); + vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime()); + vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime()); + vesselPersonFeatures.setVessel(fishingTrip.getVessel()); + vesselPersonFeatures.setProgram(fishingTrip.getProgram()); - vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime()); - vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime()); - vesselPersonFeatures.setVessel(fishingTrip.getVessel()); - vesselPersonFeatures.setProgram(fishingTrip.getProgram()); + vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate()); + vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag()); + vesselPersonFeatures.setRankOrder((short) 1); +// vesselPersonFeaturesDao.create(vesselPersonFeatures); + } - vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate()); - vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag()); - vesselPersonFeatures.setRankOrder((short) 1); + addRole(role, vesselPersonFeatures); } public void fillVesselPersonFeatures(Map<Integer, VesselPersonFeatures> vesselPersonFeaturesPerPerson, @@ -94,23 +113,45 @@ VesselPersonFeatures vesselPersonFeatures = vesselPersonFeaturesPerPerson.get(personId); if (vesselPersonFeatures == null) { + + PersonImpl person = load(PersonImpl.class, personId); + if (log.isDebugEnabled()) { + log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname()); + } + vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance(); vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures); + vesselPersonFeatures.setOperation(fishingOperation); + vesselPersonFeatures.setPerson(person); + vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime()); + vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime()); + vesselPersonFeatures.setVessel(fishingOperation.getVessel()); + vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram()); + + vesselPersonFeatures.setCreationDate(new Date()); + vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag()); + vesselPersonFeatures.setRankOrder((short) 1); +// vesselPersonFeaturesDao.create(vesselPersonFeatures); } - PersonImpl person = load(PersonImpl.class, personId); + addRole(role, vesselPersonFeatures); + } - vesselPersonFeatures.setOperation(fishingOperation); - vesselPersonFeatures.setPerson(person); - vesselPersonFeatures.getVesselPersonRoles().add(role); + protected void addRole(VesselPersonRole role, + VesselPersonFeatures vesselPersonFeatures) { + Person person = vesselPersonFeatures.getPerson(); + if (vesselPersonFeatures.getVesselPersonRoles().contains(role)) { + if (log.isWarnEnabled()) { + log.warn("vessel person feature for person: " + person.getId() + " with role: " + role.getName() + " already exist, do not add it twice."); + } + } else { - vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime()); - vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime()); - vesselPersonFeatures.setVessel(fishingOperation.getVessel()); - vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram()); + // add this new role + if (log.isInfoEnabled()) { + log.info("Add vessel person feature for person: " + person.getId() + " with role: " + role.getName()); + } + vesselPersonFeatures.getVesselPersonRoles().add(role); - vesselPersonFeatures.setCreationDate(new Date()); - vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag()); - vesselPersonFeatures.setRankOrder((short) 1); + } } } \ No newline at end of file Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977) @@ -505,8 +505,8 @@ params[3 * i + 2] = sortingQualitativeValueId; } SortingBatch result = catchBatchDao.getSortingBatch(childs, params); - if (result != null && debugMessage != null && log.isInfoEnabled()) { - log.info("Loaded " + debugMessage + ": " + result.getId()); + if (result != null && debugMessage != null && log.isDebugEnabled()) { + log.debug("Loaded " + debugMessage + ": " + result.getId()); } return result; } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:23:24 UTC (rev 977) @@ -75,6 +75,7 @@ tutti.service.exportCruise.exportMarineLitters= tutti.service.exportCruise.exportOperations= tutti.service.exportCruise.exportParameters= +tutti.service.exportCruise.exportSpecies= tutti.service.exportCruise.exportSurvey= tutti.service.exportSumatra.error.species.null= tutti.service.exportSumatra.error.station.null= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 08:23:24 UTC (rev 977) @@ -69,11 +69,11 @@ tutti.service.exportCruise.checkCruise=Vérification de la campagne %s tutti.service.exportCruise.exportAccidentalCatches=Export du fichier <strong>accidentalCatch.csv</strong> pour la campagne %s tutti.service.exportCruise.exportCatches=Export du fichier <strong>catch.csv</strong> pour la campagne %s -tutti.service.exportCruise.exportSpecies=Export du fichier <strong>species.csv</strong> pour la campagne %s tutti.service.exportCruise.exportIndividualObservations=Export du fichier <strong>individualObservation.csv</strong> pour la campagne %s tutti.service.exportCruise.exportMarineLitters=Export du fichier <strong>marineLitter.csv</strong> pour la campagne %s tutti.service.exportCruise.exportOperations=Export du fichier <strong>operations.csv</strong> pour la campagne %s tutti.service.exportCruise.exportParameters=Export du fichier <strong>parameters.csv</strong> pour la campagne %s +tutti.service.exportCruise.exportSpecies=Export du fichier <strong>species.csv</strong> pour la campagne %s tutti.service.exportCruise.exportSurvey=Export du fichier <strong>survey.csv</strong> pour la campagne %s tutti.service.exportSumatra.error.species.null=L'espèce est nulle tutti.service.exportSumatra.error.station.null=Le trait est nul