branch develop updated (50a5d54 -> 7b34b56)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 50a5d54 Merge branch 'feature/7594' into develop new b9c1233 récupération des stubs du dao plutot que les entités entieres (refs #755") new 7b34b56 merge The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b34b561d154094605377c1dd7f487240f4592ed Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 17:51:22 2015 +0200 merge commit b9c123380e377468e46c39b53228d7bfd65ed11a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:37:21 2015 +0200 récupération des stubs du dao plutot que les entités entieres (refs #755") Summary of changes: .../longline/ActivityLonglineTopiaDao.java | 2 +- .../services/dto/longline/ActivityLonglineDto.java | 9 +++++--- .../services/dto/seine/ActivitySeineDto.java | 1 + .../longline/ActivityLonglineServiceTopia.java | 24 +++++++++++++++++----- .../service/seine/ActivitySeineServiceTopia.java | 15 +++++++------- .../service/seine/FloatingObjectServiceTopia.java | 20 ++++++------------ .../services/service/seine/RouteServiceTopia.java | 9 ++++---- 7 files changed, 46 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b9c123380e377468e46c39b53228d7bfd65ed11a Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:37:21 2015 +0200 récupération des stubs du dao plutot que les entités entieres (refs #755") --- .../longline/ActivityLonglineTopiaDao.java | 2 +- .../services/dto/longline/ActivityLonglineDto.java | 9 ++++++--- .../services/dto/seine/ActivitySeineDto.java | 1 + .../longline/ActivityLonglineServiceTopia.java | 23 +++++++++++++++++----- .../service/seine/ActivitySeineServiceTopia.java | 15 +++++++------- .../service/seine/FloatingObjectServiceTopia.java | 20 ++++++------------- .../services/service/seine/RouteServiceTopia.java | 9 +++++---- 7 files changed, 45 insertions(+), 34 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 9cee6fb..2ba6ff2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -63,7 +63,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A String sql = "SELECT" + " a.topiaId," + " a.timestamp," + - " a.open," + +// " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java index 54b3022..93b9a77 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java @@ -8,9 +8,11 @@ public class ActivityLonglineDto extends AbstractActivityLonglineDto { private static final long serialVersionUID = 3991657324991701860L; - String PROPERTY_DATE = "date"; + public static final String PROPERTY_HAS_SET_LONGLINE = "hasSetLongline"; - String PROPERTY_TIME = "time"; + public static final String PROPERTY_DATE = "date"; + + public static final String PROPERTY_TIME = "time"; public Date getDate() { return timeStamp == null ? null : DateUtil.getDay(timeStamp); @@ -42,4 +44,5 @@ public class ActivityLonglineDto extends AbstractActivityLonglineDto { firePropertyChange(PROPERTY_TIME, oldTime, getTime()); } -} + +} //ActivityLonglineDto diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index ec9976d..466bac7 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -10,6 +10,7 @@ public class ActivitySeineDto extends AbstractActivitySeineDto { public static final String ACTIVITY_FIN_DE_PECHE = "6"; + public static final String PROPERTY_HAS_SET_SEINE = "hasSetSeine"; private static final long serialVersionUID = 3846974823980413495L; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 49cd6ff..6bd889f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -25,7 +25,9 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.ActivityLonglines; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; @@ -33,6 +35,7 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -44,6 +47,7 @@ import fr.ird.type.CoordinateHelper; import java.util.Calendar; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -53,16 +57,25 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByTripLongline(String tripLonglineId) { - TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + ReferenceLocale referenceLocale = getReferenceLocale(); - LinkedHashSet<ReferenceDto<ActivityLonglineDto>> stubs = Sets.newLinkedHashSet(); + ActivityLonglineTopiaDao dao = getTopiaPersistenceContext().getActivityLonglineDao(); + List<ActivityLongline> allStubByTripId = dao.findAllStubByTripId(tripLonglineId, referenceLocale); - for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { + LinkedHashSet<ReferenceDto<ActivityLonglineDto>> stubs = Sets.newLinkedHashSet(); - ReferenceDto<ActivityLonglineDto> refActivity = entityToReferenceDto(ActivityLonglineDto.class, activityLongline); + for (ActivityLongline activityLongline : allStubByTripId) { - stubs.add(refActivity); + ReferenceDto<ActivityLonglineDto> stub = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, + Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE)); + stub.setId(activityLongline.getTopiaId()); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE, activityLongline.getSetLongline() != null); + stubs.add(stub); } Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 67cabef..7b1a6e9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -28,6 +28,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.entities.seine.ActivitySeineTopiaDao; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; @@ -46,6 +47,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -58,22 +60,21 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ReferenceLocale referenceLocale = getReferenceLocale(); - Route route = loadEntity(RouteDto.class, Route.class, routeId); + ActivitySeineTopiaDao dao = getTopiaPersistenceContext().getActivitySeineDao(); + List<ActivitySeine> allStubByTripId = dao.findAllStubByRouteId(routeId, referenceLocale); LinkedHashSet<ReferenceDto<ActivitySeineDto>> stubs = Sets.newLinkedHashSet(); - for (ActivitySeine activitySeine : route.getActivitySeine()) { + for (ActivitySeine activitySeine : allStubByTripId) { ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, - Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, - ActivitySeineDto.PROPERTY_TIME, + Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - //FIXME - "hasSetSeine")); + ActivitySeineDto.PROPERTY_HAS_SET_SEINE)); stub.setId(activitySeine.getTopiaId()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_HAS_SET_SEINE, activitySeine.getSetSeine() != null); stubs.add(stub); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index c6ef724..0fbaea8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -35,10 +36,10 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; import fr.ird.observe.services.service.DataNotFoundException; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -50,24 +51,15 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F ReferenceLocale referenceLocale = getReferenceLocale(); - ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - - - for(FloatingObject floatingObject : activitySeine.getFloatingObject()) { - - FloatingObjectStubDto stub = new FloatingObjectStubDto(); - stub.setId(floatingObject.getTopiaId()); - stub.setObjectTypeLabel(referenceLocale.getLabel(floatingObject.getObjectType())); - - } + FloatingObjectTopiaDao dao = getTopiaPersistenceContext().getFloatingObjectDao(); + List<FloatingObject> allStubByActivityId = dao.findAllStubByActivityId(activitySeineId, referenceLocale); LinkedHashSet<ReferenceDto<FloatingObjectDto>> stubs = Sets.newLinkedHashSet(); - for (FloatingObject floatingObject : activitySeine.getFloatingObject()) { + for (FloatingObject floatingObject : allStubByActivityId) { ReferenceDto<FloatingObjectDto> stub = ReferenceDtos.newReferenceDto(FloatingObjectDto.class, - Lists.newArrayList(FloatingObjectDto.PROPERTY_ID, - FloatingObjectDto.PROPERTY_OBJECT_TYPE)); + Lists.newArrayList(FloatingObjectDto.PROPERTY_OBJECT_TYPE)); stub.setId(floatingObject.getTopiaId()); stub.setPropertyValue(FloatingObjectDto.PROPERTY_OBJECT_TYPE, referenceLocale.getLabel(floatingObject.getObjectType())); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index ff473d5..29c4771 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -49,6 +49,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; /** @@ -59,15 +60,15 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + RouteTopiaDao dao = getTopiaPersistenceContext().getRouteDao(); + List<Route> allStubByTripId = dao.findAllStubByTripId(tripSeineId); LinkedHashSet<ReferenceDto<RouteDto>> stubs = Sets.newLinkedHashSet(); - for (Route route : tripSeine.getRoute()) { + for (Route route : allStubByTripId) { ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, - Lists.newArrayList(RouteDto.PROPERTY_ID, - RouteDto.PROPERTY_DATE)); + Lists.newArrayList(RouteDto.PROPERTY_DATE)); stub.setId(route.getTopiaId()); stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7b34b561d154094605377c1dd7f487240f4592ed Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 17:51:22 2015 +0200 merge --- .../observe/services/service/longline/ActivityLonglineServiceTopia.java | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 6bd889f..aef1b6a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm