Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
759d9a95
by Tony Chemit at 2024-03-20T14:36:39+01:00
-
a8bf13a3
by Tony Chemit at 2024-03-20T14:37:10+01:00
-
b6f198a3
by Tony Chemit at 2024-03-20T14:37:34+01:00
-
5575d304
by Tony Chemit at 2024-03-20T14:38:13+01:00
7 changed files:
- core/api/services/pom.xml
- core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java
- + core/persistence/migration/src/main/resources/db/migration/v9/9.3/02_issue-2857-common.sql
- core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationActivitiesByZone.report
- core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationRepartionCaleeParCuve.report
- pom.xml
- toolkit/api-services/pom.xml
Changes:
| ... | ... | @@ -203,18 +203,30 @@ |
| 203 | 203 | <goal>check-services-types</goal>
|
| 204 | 204 | </goals>
|
| 205 | 205 | <configuration>
|
| 206 | - <acceptedTypes>
|
|
| 206 | + <acceptedParameterTypes>
|
|
| 207 | 207 | <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
|
| 208 | 208 | <acceptedType>java.lang.Class</acceptedType>
|
| 209 | 209 | <acceptedType>java.lang.String</acceptedType>
|
| 210 | - <acceptedType>java.util.List</acceptedType>
|
|
| 210 | + <!-- <acceptedType>java.util.List</acceptedType>-->
|
|
| 211 | 211 | <acceptedType>java.util.Set</acceptedType>
|
| 212 | 212 | <acceptedType>java.util.Map</acceptedType>
|
| 213 | 213 | <acceptedType>java.util.Date</acceptedType>
|
| 214 | - </acceptedTypes>
|
|
| 215 | - <acceptedAssignableTypes>
|
|
| 214 | + </acceptedParameterTypes>
|
|
| 215 | + <acceptedReturnTypes>
|
|
| 216 | + <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
|
|
| 217 | + <!-- <acceptedType>java.lang.Class</acceptedType>-->
|
|
| 218 | + <acceptedType>java.lang.String</acceptedType>
|
|
| 219 | + <acceptedType>java.util.List</acceptedType>
|
|
| 220 | + <acceptedType>java.util.Set</acceptedType>
|
|
| 221 | + <!-- <acceptedType>java.util.Map</acceptedType>-->
|
|
| 222 | + <acceptedType>java.util.Date</acceptedType>
|
|
| 223 | + </acceptedReturnTypes>
|
|
| 224 | + <acceptedAssignableParameterTypes>
|
|
| 225 | + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
|
|
| 226 | + </acceptedAssignableParameterTypes>
|
|
| 227 | + <acceptedAssignableReturnTypes>
|
|
| 216 | 228 | <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
|
| 217 | - </acceptedAssignableTypes>
|
|
| 229 | + </acceptedAssignableReturnTypes>
|
|
| 218 | 230 | </configuration>
|
| 219 | 231 | </execution>
|
| 220 | 232 | </executions>
|
| ... | ... | @@ -49,6 +49,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe |
| 49 | 49 | if (withIds) {
|
| 50 | 50 | // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044
|
| 51 | 51 | executor.addScript("01", "issue-2044");
|
| 52 | + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857
|
|
| 53 | + executor.addScript("01", "issue-2857");
|
|
| 52 | 54 | }
|
| 53 | 55 | }
|
| 54 | 56 |
| 1 | +UPDATE ps_observation.Catch Set well = NULL Where well = ''; |
|
| \ No newline at end of file |
| ... | ... | @@ -42,7 +42,8 @@ From fr.ird.observe.entities.data.ps.common.TripImpl m \ |
| 42 | 42 | Join m.routeObs r \
|
| 43 | 43 | Join r.activity a With a.currentFpaZone.id = :zoneFpaId \
|
| 44 | 44 | Join a.floatingObject dcp \
|
| 45 | -Where m.id In :tripId
|
|
| 45 | +Where m.id In :tripId \
|
|
| 46 | +Group By a.currentFpaZone.code, a.currentFpaZone.@i18nColumnName@
|
|
| 46 | 47 | request.1.repeat.name=zoneFpaId
|
| 47 | 48 | request.1.repeat.layout=column
|
| 48 | 49 | request.1.comment=visite + peche / visite - peche / Deploiement + peche / Deploiement - peche / Modifie + peche / Modifie - peche / Retire + peche / Retire - peche / Abandonne + peche / Abandonne - peche / Coule + peche / Coule - peche / Remplace + peche / Remplace - peche / Autre ou ancien peche + peche / Autre ou ancien peche - peche / Nombre de tortues
|
| ... | ... | @@ -34,14 +34,15 @@ request.1.layout=row |
| 34 | 34 | request.1.request=Select r.date, Cast(a.time As java.sql.Time), \
|
| 35 | 35 | a.latitude, \
|
| 36 | 36 | a.longitude, \
|
| 37 | -case when a.set.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \
|
|
| 37 | +case when s.schoolType.id = 'fr.ird.referential.ps.common.SchoolType#0#1' then 'BO' else 'BL' end, \
|
|
| 38 | 38 | tc.species.faoCode, \
|
| 39 | 39 | Sum(tc.catchWeight), \
|
| 40 | 40 | tc.well \
|
| 41 | 41 | From TripImpl t \
|
| 42 | 42 | Join t.routeObs r \
|
| 43 | -Join r.activity a \
|
|
| 44 | -Join a.set.catches tc \
|
|
| 45 | -Where t.id In :tripId and tc.well != null \
|
|
| 46 | -Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, a.set.schoolType \
|
|
| 43 | +Join r.activity a With a.set Is Not Null \
|
|
| 44 | +Join a.set s With s.catches Is Not Empty \
|
|
| 45 | +Join s.catches tc With tc.well Is Not Null And tc.well != '' \
|
|
| 46 | +Where t.id In :tripId \
|
|
| 47 | +Group By r.date, a.time, a.latitude, a.longitude, tc.species, tc.species.faoCode, tc.well, s.schoolType \
|
|
| 47 | 48 | Order By r.date, a.time, tc.species, tc.well |
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2024.13</version>
|
|
| 26 | + <version>2024.14</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|
| ... | ... | @@ -154,18 +154,30 @@ |
| 154 | 154 | <goal>check-services-types</goal>
|
| 155 | 155 | </goals>
|
| 156 | 156 | <configuration>
|
| 157 | - <acceptedTypes>
|
|
| 157 | + <acceptedParameterTypes>
|
|
| 158 | 158 | <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
|
| 159 | 159 | <acceptedType>java.lang.Class</acceptedType>
|
| 160 | 160 | <acceptedType>java.lang.String</acceptedType>
|
| 161 | - <acceptedType>java.util.List</acceptedType>
|
|
| 161 | +<!-- <acceptedType>java.util.List</acceptedType>-->
|
|
| 162 | 162 | <acceptedType>java.util.Set</acceptedType>
|
| 163 | 163 | <acceptedType>java.util.Map</acceptedType>
|
| 164 | 164 | <acceptedType>java.util.Date</acceptedType>
|
| 165 | - </acceptedTypes>
|
|
| 166 | - <acceptedAssignableTypes>
|
|
| 165 | + </acceptedParameterTypes>
|
|
| 166 | + <acceptedReturnTypes>
|
|
| 167 | + <acceptedType>io.ultreia.java4all.util.Version</acceptedType>
|
|
| 168 | +<!-- <acceptedType>java.lang.Class</acceptedType>-->
|
|
| 169 | + <acceptedType>java.lang.String</acceptedType>
|
|
| 170 | + <acceptedType>java.util.List</acceptedType>
|
|
| 171 | + <acceptedType>java.util.Set</acceptedType>
|
|
| 172 | +<!-- <acceptedType>java.util.Map</acceptedType>-->
|
|
| 173 | + <acceptedType>java.util.Date</acceptedType>
|
|
| 174 | + </acceptedReturnTypes>
|
|
| 175 | + <acceptedAssignableParameterTypes>
|
|
| 176 | + <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
|
|
| 177 | + </acceptedAssignableParameterTypes>
|
|
| 178 | + <acceptedAssignableReturnTypes>
|
|
| 167 | 179 | <acceptedAssignableType>io.ultreia.java4all.util.json.JsonAware</acceptedAssignableType>
|
| 168 | - </acceptedAssignableTypes>
|
|
| 180 | + </acceptedAssignableReturnTypes>
|
|
| 169 | 181 | </configuration>
|
| 170 | 182 | </execution>
|
| 171 | 183 | </executions>
|