This is an automated email from the git hooks/post-receive script. New commit to branch feature/8145-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 68c508a494b5c30ed39f4c4ab058cbfd06b6ae31 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 20 22:15:08 2016 +0100 Ajout méthode pour récupérer les ids des batchs enfants --- .../java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 5 +++++ .../fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 5 +++++ .../persistence/service/BenthosBatchPersistenceService.java | 9 +++++++++ .../persistence/service/SpeciesBatchPersistenceService.java | 9 +++++++++ .../service/SpeciesBatchPersistenceServiceSupport.java | 7 ++++++- 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index 6d9d10b..bad70b6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -1165,6 +1165,11 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override + public Set<Integer> getBatchChildIds(Integer id) { + return getSpeciesBatchService().getBatchChildIds(id); + } + + @Override public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { return getSpeciesBatchService().createSpeciesBatch(bean, parentBatchId, computeRankOrder); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index c851073..f5f9e14 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -689,6 +689,11 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override + public Set<Integer> getBatchChildIds(Integer id) { + throw notImplemented(); + } + + @Override public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java index 93003b1..01e74d4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; +import java.util.Set; /** * Service to persist {@link SpeciesBatch}. @@ -62,6 +63,14 @@ public interface BenthosBatchPersistenceService extends TuttiPersistenceServiceI */ BatchContainer<SpeciesBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException; + /** + * Récupérer les identifiants de tous les lots de la descendance du lot donné. + * + * @param id identifiant du lot parent + * @return l'ensemble des identifiants de toute la descendance d'un lot + */ + Set<Integer> getBatchChildIds(Integer id); + @Transactional(readOnly = false) SpeciesBatch createBenthosBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java index f122907..4a2eebb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; +import java.util.Set; /** * Service to persist {@link SpeciesBatch}. @@ -62,6 +63,14 @@ public interface SpeciesBatchPersistenceService extends TuttiPersistenceServiceI BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException; + /** + * Récupérer les identifiants de tous les lots de la descendance du lot donné. + * + * @param id identifiant du lot parent + * @return l'ensemble des identifiants de toute la descendance d'un lot + */ + Set<Integer> getBatchChildIds(Integer id); + @Transactional(readOnly = false) SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceSupport.java index cdd6351..1fa4c87 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceSupport.java @@ -98,7 +98,7 @@ public abstract class SpeciesBatchPersistenceServiceSupport extends AbstractPers private CaracteristicPersistenceService caracteristicService; @Resource(name = "batchPersistenceHelper") - private BatchPersistenceHelper batchHelper; + protected BatchPersistenceHelper batchHelper; @Resource(name = "measurementPersistenceHelper") protected MeasurementPersistenceHelper measurementPersistenceHelper; @@ -116,6 +116,11 @@ public abstract class SpeciesBatchPersistenceServiceSupport extends AbstractPers this.batchFactory = batchFactory; this.frequencyFactory = frequencyFactory; } + + public Set<Integer> getBatchChildIds(Integer id) { + return batchHelper.getBatchIds(id); + } + //------------------------------------------------------------------------// //-- SpeciesBatch methods --// //------------------------------------------------------------------------// -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.