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 b8f66252645c8c78347bb0644e39bfb54be289c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:56:25 2015 +0200 refs #6933 Pouvoir récuperer tous les marées --- .../entities/longline/TripLonglineDAOImpl.java | 32 +++++++++++++++++++++- .../observe/entities/seine/TripSeineDAOImpl.java | 32 +++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java index 525361b..f64a5d2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineDAOImpl.java @@ -53,6 +53,13 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO return -1; } + public List<E> findAllStub(ReferenceLocale referenceLocale) throws TopiaException { + + List<E> result = StubSqlQuery.findAll(context, referenceLocale); + return result; + + } + public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) throws TopiaException { List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); @@ -81,6 +88,27 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO this.referenceLocale = referenceLocale; } + public static <E extends TripLongline> List<E> findAll(TopiaContextImplementor context, ReferenceLocale referenceLocale) throws TopiaException { + + String sql = "SELECT" + + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " t.open," + + " p.lastName," + + " p.firstName," + + " v." + referenceLocale.getColumnName() + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.observer = p.topiaId" + + " AND t.vessel = v.topiaId" + + " ORDER BY t.endDate"; + + StubSqlQuery<E> request = new StubSqlQuery<E>(sql, null, referenceLocale); + return request.findMultipleResult(context); + + } + public static <E extends TripLongline> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) throws TopiaException { String sql = "SELECT" + @@ -128,7 +156,9 @@ public class TripLonglineDAOImpl<E extends TripLongline> extends TripLonglineDAO @Override protected PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, id); + if (id!=null) { + preparedStatement.setString(1, id); + } return preparedStatement; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index 08a63a9..8c02673 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -58,6 +58,13 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< return -1; } + public List<E> findAllStub(ReferenceLocale referenceLocale) throws TopiaException { + + List<E> result = StubSqlQuery.findAll(context, referenceLocale); + return result; + + } + public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) throws TopiaException { List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); @@ -102,6 +109,27 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } + static <E extends TripSeine> List<E> findAll(TopiaContextImplementor context, ReferenceLocale referenceLocale) throws TopiaException { + + String sql = "SELECT" + + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " t.open," + + " p.lastName," + + " p.firstName," + + " v." + referenceLocale.getColumnName() + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.observer = p.topiaId" + + " AND t.vessel = v.topiaId" + + " ORDER BY t.endDate"; + + StubSqlQuery<E> request = new StubSqlQuery<E>(sql, null, referenceLocale); + return request.findMultipleResult(context); + + } + static <E extends TripSeine> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) throws TopiaException { String sql = "SELECT" + @@ -133,7 +161,9 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< @Override protected PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, id); + if (id != null) { + preparedStatement.setString(1, id); + } return preparedStatement; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.