branch feature/7458-LonglineTopiaService updated (15f1936 -> e84f5c0)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git from 15f1936 changement d'implantaton de la transformation de l'entité en formulaire. new 95ad74d implantation ActivityLongLineEncouterService (refs #7458). new e7c9224 implantation ActivityLongLineEncouterService (refs #7458). new 6e869d9 implantation ActivityLongLineSensorUsedService (refs #7458). new e84f5c0 implantation SetLonglineService (refs #7458). The 4 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 e84f5c0a6eee56d4eb9f0ea0759860d41f937c49 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:42:33 2015 +0200 implantation SetLonglineService (refs #7458). commit 6e869d9b9f4bb478b17bc9a4b47591945e80ba64 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:29:02 2015 +0200 implantation ActivityLongLineSensorUsedService (refs #7458). commit e7c9224d34bb5dfafb386a5091047ef91a733300 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:25:27 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). commit 95ad74dc5aeefda5f187d3f935cdadbb7186fbe4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:23:19 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). Summary of changes: .../ActivityLongLineSensorUsedService.java | 3 +- .../service/longline/SetLonglineService.java | 5 +- .../ActivityLongLineEncouterServiceTopia.java | 54 ++++++++++ .../ActivityLongLineSensorUsedServiceTopia.java | 54 ++++++++++ .../service/longline/SetLonglineServiceTopia.java | 112 +++++++++++++++++++++ 5 files changed, 222 insertions(+), 6 deletions(-) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java -- 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 feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git commit 95ad74dc5aeefda5f187d3f935cdadbb7186fbe4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:23:19 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). --- .../ActivityLongLineEncouterServiceTopia.java | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java new file mode 100644 index 0000000..97713a4 --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -0,0 +1,47 @@ +package fr.ird.observe.services.service.longline; + +import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncouterService { + + @Override + public FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); + + FormDto<ActivityLonglineEncouterDto> form = entityToReadFormDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLongline); + + return form; + + } + + @Override + public FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); + + FormDto<ActivityLonglineEncouterDto> form = entityToEditFormDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLongline); + + return form; + + } + + @Override + public String save(FormDto<ActivityLonglineEncouterDto> form) { + + ActivityLongline activityLongline = dtoToEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, form.getForm()); + + activityLongline = saveEntity(ActivityLongline.class, activityLongline); + + return activityLongline.getTopiaId(); + + } + + +} -- 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 feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git commit e7c9224d34bb5dfafb386a5091047ef91a733300 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:25:27 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). --- .../service/longline/ActivityLongLineEncouterServiceTopia.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java index 97713a4..cf2fe1e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -4,6 +4,8 @@ import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -26,7 +28,12 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); - FormDto<ActivityLonglineEncouterDto> form = entityToEditFormDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLongline); + FormDto<ActivityLonglineEncouterDto> form = entityToEditFormDto( + ActivityLonglineEncouterDto.class, + ActivityLongline.class, + activityLongline, + EncounterTypeDto.class, + SpeciesDto.class); return form; -- 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 feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git commit 6e869d9b9f4bb478b17bc9a4b47591945e80ba64 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:29:02 2015 +0200 implantation ActivityLongLineSensorUsedService (refs #7458). --- .../ActivityLongLineSensorUsedService.java | 3 +- .../ActivityLongLineSensorUsedServiceTopia.java | 54 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java index 41ed246..c7f5388 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java @@ -2,7 +2,6 @@ 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.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.spi.Write; @@ -16,6 +15,6 @@ public interface ActivityLongLineSensorUsedService extends ObserveService { FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId); @Write - String save(FormDto<ActivityLonglineEncouterDto> form); + String save(FormDto<ActivityLonglineSensorUsedDto> form); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java new file mode 100644 index 0000000..547d474 --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -0,0 +1,54 @@ +package fr.ird.observe.services.service.longline; + +import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia implements ActivityLongLineSensorUsedService { + + @Override + public FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); + + FormDto<ActivityLonglineSensorUsedDto> form = entityToReadFormDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLongline); + + return form; + + } + + @Override + public FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); + + FormDto<ActivityLonglineSensorUsedDto> form = entityToEditFormDto( + ActivityLonglineSensorUsedDto.class, + ActivityLongline.class, + activityLongline, + SensorTypeDto.class, + SensorBrandDto.class, + SensorDataFormatDto.class); + + return form; + + } + + @Override + public String save(FormDto<ActivityLonglineSensorUsedDto> form) { + + ActivityLongline activityLongline = dtoToEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, form.getForm()); + + activityLongline = saveEntity(ActivityLongline.class, activityLongline); + + return activityLongline.getTopiaId(); + + } +} -- 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 feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git commit e84f5c0a6eee56d4eb9f0ea0759860d41f937c49 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:42:33 2015 +0200 implantation SetLonglineService (refs #7458). --- .../service/longline/SetLonglineService.java | 5 +- .../service/longline/SetLonglineServiceTopia.java | 112 +++++++++++++++++++++ 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index b95c7ff..8f37657 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -2,7 +2,6 @@ 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.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.spi.Write; @@ -11,8 +10,6 @@ import fr.ird.observe.services.spi.Write; */ public interface SetLonglineService extends ObserveService { - ReferenceDto<SetLonglineDto> getSetLonglineByActivityLongline(String activityLonglineId); - FormDto<SetLonglineDto> loadToRead(String setLonglineId); FormDto<SetLonglineDto> loadToEdit(String setLonglineId); @@ -20,7 +17,7 @@ public interface SetLonglineService extends ObserveService { FormDto<SetLonglineDto> preCreate(String activityLonglineId); @Write - String save(FormDto<SetLonglineDto> form); + String save(String activityLonglineId, FormDto<SetLonglineDto> form); @Write void delete(String activityLonglineId, String setLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java new file mode 100644 index 0000000..de64f79 --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -0,0 +1,112 @@ +package fr.ird.observe.services.service.longline; + +import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.service.DataNotFoundException; +import org.apache.commons.lang3.time.DateUtils; + +import java.util.Date; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetLonglineService { + + @Override + public FormDto<SetLonglineDto> loadToRead(String setLonglineId) { + + SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); + + FormDto<SetLonglineDto> form = entityToReadFormDto(SetLonglineDto.class, SetLongline.class, setLongline); + + return form; + + } + + @Override + public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { + + SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); + + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, setLongline); + + return form; + + } + + @Override + public FormDto<SetLonglineDto> preCreate(String activityLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); + + SetLongline preCreated = newEntity(SetLongline.class); + + // on utilise la date - heure de l'activité pour initialiser les horodatages + // de l'opération de peche + Date timeStamp = activityLongline.getTimeStamp(); + preCreated.setSettingStartTimeStamp(timeStamp); + preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1)); + preCreated.setHaulingStartTimeStamp(DateUtils.addHours(timeStamp, 2)); + preCreated.setHaulingEndTimeStamp(DateUtils.addHours(timeStamp, 3)); + + // on reporte la position de l'activité pour la position de début de filage + Float latitude = activityLongline.getLatitude(); + Float longitude = activityLongline.getLongitude(); + + // On enregistre deux fois les coordonnées car la première fois on perd le signe à cause de l'éditeur + preCreated.setSettingStartLatitude(latitude); + preCreated.setSettingStartLongitude(longitude); + preCreated.setSettingStartLatitude(latitude); + preCreated.setSettingStartLongitude(longitude); + + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, preCreated); + + return form; + + } + + @Override + public String save(String activityLonglineId, FormDto<SetLonglineDto> form) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); + + SetLonglineDto setLonglineDto = form.getForm(); + + SetLongline setLongline = dtoToEntity(SetLonglineDto.class, SetLongline.class, setLonglineDto); + + setLongline = saveEntity(SetLongline.class, setLongline); + + if (setLonglineDto.isNotPersisted()) { + + activityLongline.setSetLongline(setLongline); + + saveEntity(ActivityLongline.class, activityLongline); + + } + + return setLongline.getTopiaId(); + + } + + @Override + public void delete(String activityLonglineId, String setLonglineId) { + + ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); + + SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); + + if (!activityLongline.getSetLongline().equals(setLongline)) { + + throw new DataNotFoundException(SetLonglineDto.class, setLonglineId); + + } + + activityLongline.setSetLongline(null); + + } + +} -- 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