Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe
Commits:
-
87c047a1
by Tony Chemit at 2021-07-06T07:46:13+02:00
3 changed files:
- models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java
- models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialImportContext.java
- models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/OceanInterceptor.java
Changes:
| ... | ... | @@ -206,8 +206,8 @@ public class ImportEngine implements Closeable { |
| 206 | 206 |
long time0 = TimeLog.getTime();
|
| 207 | 207 |
|
| 208 | 208 |
try (DataTables tables = new DataTables(getConn())) {
|
| 209 |
- int tripCount = tables.tripTableReader.tableReadCount();
|
|
| 210 |
- getConfiguration().incrementsProgression(String.format("Détection de %d marée(s).", tripCount));
|
|
| 209 |
+ @SuppressWarnings("SpellCheckingInspection") int tripCount = tablesReadCount.get("MAREE");
|
|
| 210 |
+ getConfiguration().incrementsProgression(String.format("%d detected trip(s).", tripCount));
|
|
| 211 | 211 |
getConfiguration().getProgressionModel().setValue(0);
|
| 212 | 212 |
getConfiguration().getProgressionModel().setMaximum(tripCount);
|
| 213 | 213 |
read(tables);
|
| ... | ... | @@ -29,6 +29,7 @@ import fr.ird.observe.entities.ObserveTopiaPersistenceContext; |
| 29 | 29 |
import fr.ird.observe.entities.referential.ReferentialEntity;
|
| 30 | 30 |
import fr.ird.observe.entities.referential.common.DataQuality;
|
| 31 | 31 |
import fr.ird.observe.entities.referential.common.LengthMeasureMethod;
|
| 32 |
+import fr.ird.observe.entities.referential.common.Ocean;
|
|
| 32 | 33 |
import fr.ird.observe.entities.referential.common.Program;
|
| 33 | 34 |
import fr.ird.observe.entities.referential.common.SizeMeasureType;
|
| 34 | 35 |
import fr.ird.observe.entities.referential.common.WeightMeasureMethod;
|
| ... | ... | @@ -142,6 +143,7 @@ public class AvdthReferentialImportContext implements Closeable { |
| 142 | 143 |
result.setSpecies(new LinkedList<>());
|
| 143 | 144 |
result.setHarbour(new LinkedList<>());
|
| 144 | 145 |
try (ObserveTopiaPersistenceContext persistenceContext = getPersistenceApplicationContext().newPersistenceContext()) {
|
| 146 |
+ prepare(Ocean.SPI, persistenceContext, result::setOcean);
|
|
| 145 | 147 |
prepare(WellContentStatus.SPI, persistenceContext, result::setWellContentStatus);
|
| 146 | 148 |
prepare(Program.SPI, persistenceContext, result::setProgram);
|
| 147 | 149 |
prepare(DataQuality.SPI, persistenceContext, result::setDataQuality);
|
| ... | ... | @@ -23,6 +23,7 @@ package fr.ird.observe.persistence.avdth.referential.interceptors; |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import com.google.common.collect.ImmutableMap;
|
| 26 |
+import com.google.common.collect.Maps;
|
|
| 26 | 27 |
import fr.ird.observe.dto.referential.ReferenceStatus;
|
| 27 | 28 |
import fr.ird.observe.entities.ObserveTopiaPersistenceContext;
|
| 28 | 29 |
import fr.ird.observe.entities.referential.common.Ocean;
|
| ... | ... | @@ -143,6 +144,8 @@ public class OceanInterceptor extends ReferentialInterceptor<Ocean, OceanSpi> { |
| 143 | 144 |
|
| 144 | 145 |
@Override
|
| 145 | 146 |
public void consume(AvdthReferentialImportResult result, List<Ocean> newList) {
|
| 146 |
- result.setOcean(newList);
|
|
| 147 |
+ List<Ocean> existing = result.getOcean();
|
|
| 148 |
+ Map<String, Ocean> byCode = new TreeMap<>(Maps.uniqueIndex(existing, Ocean::getCode));
|
|
| 149 |
+ newList.stream().filter(entity -> !byCode.containsKey(entity.getCode())).forEach(existing::add);
|
|
| 147 | 150 |
}
|
| 148 | 151 |
}
|