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 f897944f4dc36ee59121237f3f10e237143f4b60 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 18:06:51 2015 +0200 service et DTO pour les cartes de marées (refs #7620) --- .../v1/longline/TripLonglineServiceController.java | 6 ++ .../v1/seine/TripSeineServiceController.java | 6 ++ observe-entities/pom.xml | 6 ++ .../entities/longline/TripLonglineTopiaDao.java | 32 +++++----- .../observe/entities/seine/TripSeineTopiaDao.java | 18 +++--- .../java/fr/ird/observe/tripMap/TripMapPoint.java | 71 --------------------- .../service/longline/TripLonglineService.java | 4 ++ .../services/service/seine/TripSeineService.java | 4 ++ .../services/dto/constants}/TripMapPointType.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 39020 -> 41878 bytes .../services/dto/ObserveDtosInitializer.java | 10 +++ .../service/longline/TripLonglineServiceTopia.java | 16 +++++ .../service/seine/TripSeineServiceTopia.java | 16 +++++ 13 files changed, 94 insertions(+), 97 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index 52ede2b..a6f84a7 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.service.longline.TripLonglineService; @@ -44,6 +45,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public TripMapDto getTripLonglineMap(String tripLonglineId) { + return service.getTripLonglineMap(tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { return service.loadToRead(tripLonglineId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 749e6f4..29a4387 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; @@ -44,6 +45,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public TripMapDto getTripSeineMap(String tripSeineId) { + return service.getTripSeineMap(tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToRead(String tripSeineId) { return service.loadToRead(tripSeineId); } diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index bf0c74c..5df1225 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -45,6 +45,12 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-model</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index bba6edd..842f7c7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -29,8 +29,8 @@ import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; -import fr.ird.observe.tripMap.TripMapPoint; -import fr.ird.observe.tripMap.TripMapPointType; +import fr.ird.observe.services.dto.TripMapPointDto; +import fr.ird.observe.services.dto.constants.TripMapPointType; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -77,18 +77,18 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } - public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { + public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPoint> tripMapPoints = Lists.newLinkedList(); + List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); // add departure harbours Harbour departureHarbour = tripLongline.getDepartureHarbour(); if (departureHarbour != null && departureHarbour.getLatitude() != null && departureHarbour.getLongitude() != null) { - TripMapPoint departurePoint = new TripMapPoint(); + TripMapPointDto departurePoint = new TripMapPointDto(); departurePoint.setTime(tripLongline.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); @@ -98,8 +98,8 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // Add Activities TripMapActivityPointQuery tripMapActivityPointQuery = new TripMapActivityPointQuery(tripId); - List<List<TripMapPoint>> results = topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery); - for (List<TripMapPoint> result : results) { + List<List<TripMapPointDto>> results = topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery); + for (List<TripMapPointDto> result : results) { tripMapPoints.addAll(result); } @@ -108,7 +108,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl if (landingHarbour != null && landingHarbour.getLatitude() != null && landingHarbour.getLongitude() != null) { - TripMapPoint landingPoint = new TripMapPoint(); + TripMapPointDto landingPoint = new TripMapPointDto(); landingPoint.setTime(tripLongline.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); @@ -119,7 +119,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSqlQuery<List<TripMapPoint>> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<List<TripMapPointDto>> { private static String SQL = "SELECT" + " a.timestamp, " + @@ -158,14 +158,14 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } @Override - public List<TripMapPoint> prepareResult(ResultSet resultSet) throws SQLException { + public List<TripMapPointDto> prepareResult(ResultSet resultSet) throws SQLException { - List<TripMapPoint> result = Lists.newLinkedList(); + List<TripMapPointDto> result = Lists.newLinkedList(); if (resultSet.getString(5) == null) { // activity - TripMapPoint activity = new TripMapPoint(); + TripMapPointDto activity = new TripMapPointDto(); activity.setTime(resultSet.getDate(1)); activity.setLatitude(resultSet.getFloat(2)); activity.setLongitude(resultSet.getFloat(3)); @@ -186,7 +186,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // settingStart if (resultSet.getString(5) != null) { - TripMapPoint settingStart = new TripMapPoint(); + TripMapPointDto settingStart = new TripMapPointDto(); settingStart.setTime(resultSet.getDate(5)); settingStart.setLatitude(resultSet.getFloat(6)); settingStart.setLongitude(resultSet.getFloat(7)); @@ -196,7 +196,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // settingEnd if (resultSet.getString(8) != null) { - TripMapPoint settingEnd = new TripMapPoint(); + TripMapPointDto settingEnd = new TripMapPointDto(); settingEnd.setTime(resultSet.getDate(8)); settingEnd.setLatitude(resultSet.getFloat(9)); settingEnd.setLongitude(resultSet.getFloat(10)); @@ -206,7 +206,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // haulingStart if (resultSet.getString(11) != null) { - TripMapPoint haulingStart = new TripMapPoint(); + TripMapPointDto haulingStart = new TripMapPointDto(); haulingStart.setTime(resultSet.getDate(11)); haulingStart.setLatitude(resultSet.getFloat(12)); haulingStart.setLongitude(resultSet.getFloat(13)); @@ -216,7 +216,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // haulingEnd if (resultSet.getString(14) != null) { - TripMapPoint haulingEnd = new TripMapPoint(); + TripMapPointDto haulingEnd = new TripMapPointDto(); haulingEnd.setTime(resultSet.getDate(14)); haulingEnd.setLatitude(resultSet.getFloat(15)); haulingEnd.setLongitude(resultSet.getFloat(16)); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 425045c..4bf20af 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -29,8 +29,8 @@ import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; -import fr.ird.observe.tripMap.TripMapPoint; -import fr.ird.observe.tripMap.TripMapPointType; +import fr.ird.observe.services.dto.TripMapPointDto; +import fr.ird.observe.services.dto.constants.TripMapPointType; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -80,16 +80,16 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { + public List<TripMapPointDto> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); - List<TripMapPoint> tripMapPoints = Lists.newLinkedList(); + List<TripMapPointDto> tripMapPoints = Lists.newLinkedList(); // add departure harbours Harbour departureHarbour = tripSeine.getDepartureHarbour(); if (departureHarbour != null) { - TripMapPoint departurePoint = new TripMapPoint(); + TripMapPointDto departurePoint = new TripMapPointDto(); departurePoint.setTime(tripSeine.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); @@ -104,7 +104,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { // add landing harbours Harbour landingHarbour = tripSeine.getLandingHarbour(); if (landingHarbour != null) { - TripMapPoint landingPoint = new TripMapPoint(); + TripMapPointDto landingPoint = new TripMapPointDto(); landingPoint.setTime(tripSeine.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); @@ -115,7 +115,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPoint> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPointDto> { private static String SQL = "SELECT" + " r.date, " + @@ -146,9 +146,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } @Override - public TripMapPoint prepareResult(ResultSet resultSet) throws SQLException { + public TripMapPointDto prepareResult(ResultSet resultSet) throws SQLException { - TripMapPoint point = new TripMapPoint(); + TripMapPointDto point = new TripMapPointDto(); Date time = DateUtil.getDateAndTime(resultSet.getDate(1), resultSet.getTime(2), true, false); point.setTime(time); point.setLatitude(resultSet.getFloat(3)); diff --git a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java b/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java deleted file mode 100644 index db5be3f..0000000 --- a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java +++ /dev/null @@ -1,71 +0,0 @@ -package fr.ird.observe.tripMap; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import java.util.Date; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class TripMapPoint { - - protected Date time; - - protected float latitude; - - protected float longitude; - - protected TripMapPointType type; - - public Date getTime() { - return time; - } - - public void setTime(Date time) { - this.time = time; - } - - public float getLatitude() { - return latitude; - } - - public void setLatitude(float latitude) { - this.latitude = latitude; - } - - public float getLongitude() { - return longitude; - } - - public void setLongitude(float longitude) { - this.longitude = longitude; - } - - public TripMapPointType getType() { - return type; - } - - public void setType(TripMapPointType type) { - this.type = type; - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index be7c753..542ab5c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -42,6 +43,9 @@ public interface TripLonglineService extends ObserveService { ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); @ReadDataPermission + TripMapDto getTripLonglineMap(String tripLonglineId); + + @ReadDataPermission FormDto<TripLonglineDto> loadToRead(String tripLonglineId); @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 10d0a82..7837185 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -42,6 +43,9 @@ public interface TripSeineService extends ObserveService { ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId); @ReadDataPermission + TripMapDto getTripSeineMap(String tripSeineId); + + @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); @WriteDataPermission diff --git a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java similarity index 97% rename from observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java index 173f00d..a604760 100644 --- a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java @@ -1,4 +1,4 @@ -package fr.ird.observe.tripMap; +package fr.ird.observe.services.dto.constants; /* * #%L diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index d0c8242..41d4637 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 164b6d8..f6927b1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -351,6 +351,16 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { } @Override + public void initTripMapDto() { + // Rien à fairea + } + + @Override + public void initTripMapPointDto() { + // Rien à faire + } + + @Override public void initObserveDbUserDto() { // Rien à faire } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 10a2e0f..8ea8e6d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -35,6 +35,8 @@ 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.TripMapDto; +import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -90,6 +92,20 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public TripMapDto getTripLonglineMap(String tripLonglineId) { + + List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); + + TripMapDto tripMapDto = new TripMapDto(); + + tripMapDto.setId(tripLonglineId); + + tripMapDto.setPoints(points); + + return tripMapDto; + } + + @Override public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 0a7f6cf..48f02c9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -35,6 +35,8 @@ 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.TripMapDto; +import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; @@ -93,6 +95,20 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public TripMapDto getTripSeineMap(String tripSeineId) { + + List<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); + + TripMapDto tripMapDto = new TripMapDto(); + + tripMapDto.setId(tripSeineId); + + tripMapDto.setPoints(points); + + return tripMapDto; + } + + @Override public FormDto<TripSeineDto> loadToRead(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.