Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ef5344b6 by Tony CHEMIT at 2018-02-21T00:05:08+01:00 [N0] Calcul des temps de pêche (See #240) - - - - - 3 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java - t3-domain/src/main/xmi/t3-persistence.zargo Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/ActivityImpl.java @@ -59,6 +59,17 @@ public class ActivityImpl extends ActivityAbstract { ); protected Integer quadrant; + private transient Date date; + + @Override + public Date getDate() { + return date != null ? date : getRoute().getDate(); + } + + @Override + public void setDate(Date date) { + this.date = date; + } @Override public Trip getTrip() { ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_2.java @@ -77,13 +77,13 @@ public class T3MigrationCallbackV2_2 extends T3MigrationCallbackSupport { for (String tripId : tripList) { int i = tripId.indexOf('#'); - String routeIdPrefix = "fr.ird.t3.entities.data.Route#" + tripId.substring(i + 1, tripId.lastIndexOf('#') + 1); + String routeIdPrefix = "fr.ird.t3.entities.data.Route#" + tripId.substring(i + 1).replace(".", "").replace("#", "") + "#"; log.info("Route prefix: " + routeIdPrefix); List<TripActivity> activityList = sqlSupport.findMultipleResult(new TopiaSqlQuery<TripActivity>() { @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement("SELECT a.topiaId, a.date FROM activity a WHERE a.trip = ?"); + PreparedStatement preparedStatement = connection.prepareStatement("SELECT a.topiaId, a.date FROM activity a WHERE a.trip = ? ORDER BY date"); preparedStatement.setString(1, tripId); return preparedStatement; } @@ -94,9 +94,8 @@ public class T3MigrationCallbackV2_2 extends T3MigrationCallbackSupport { } }); - - Set<Date> days = new LinkedHashSet<>(); int activityIndex = 0; + Set<Date> days = new LinkedHashSet<>(); for (TripActivity activity : activityList) { String dayDateStr = df.format(activity.date); @@ -105,10 +104,10 @@ public class T3MigrationCallbackV2_2 extends T3MigrationCallbackSupport { if (days.add(activity.date)) { log.info(String.format("[%s] new Route: %s", tripId, routeId)); - // create new route + activityIndex = 0; queries.add(String.format("INSERT INTO Route(topiaId, topiaVersion, topiaCreateDate, trip, trip_idx, date) VALUES('%s', 0, CURRENT_TIMESTAMP, '%s', %d, to_date('%s', 'YYY-MM-DD'));", routeId, tripId, days.size() - 1, dayDateStr)); } - queries.add(String.format("UPDATE Activity SET route = '%s', route_idx = %d , topiaVersion = topiaVersion + 1 WHERE topiaId = '%s';", routeId, (activityIndex++), activity.activity)); + queries.add(String.format("UPDATE Activity SET route = '%s', route_idx = %d , topiaVersion = topiaVersion + 1 WHERE topiaId = '%s';", routeId, activityIndex++, activity.activity)); } if (!activityList.isEmpty()) { ===================================== t3-domain/src/main/xmi/t3-persistence.zargo ===================================== Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ef5344b6cf1d59efc1ca7e6d4a748231f... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ef5344b6cf1d59efc1ca7e6d4a748231f... You're receiving this email because of your account on gitlab.com.