| ... |
... |
@@ -28,7 +28,6 @@ import fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource; |
|
28
|
28
|
import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto;
|
|
29
|
29
|
import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto;
|
|
30
|
30
|
import fr.ird.observe.dto.decoration.DecoratorService;
|
|
31
|
|
-import fr.ird.observe.dto.decoration.DecoratorServiceApplicationComponent;
|
|
32
|
31
|
import fr.ird.observe.dto.referential.I18nReferentialHelper;
|
|
33
|
32
|
import fr.ird.observe.dto.referential.ReferentialLocale;
|
|
34
|
33
|
import fr.ird.observe.entities.EntityHelper;
|
| ... |
... |
@@ -54,6 +53,7 @@ import fr.ird.observe.entities.referential.common.Species; |
|
54
|
53
|
import fr.ird.observe.entities.referential.ps.common.SchoolType;
|
|
55
|
54
|
import fr.ird.observe.entities.referential.ps.common.SpeciesFate;
|
|
56
|
55
|
import fr.ird.observe.entities.referential.ps.observation.ObjectMaterial;
|
|
|
56
|
+import fr.ird.observe.services.local.ObserveServiceContextLocal;
|
|
57
|
57
|
import fr.ird.observe.services.local.service.ObserveServiceLocal;
|
|
58
|
58
|
import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
|
|
59
|
59
|
import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
|
| ... |
... |
@@ -143,6 +143,13 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
|
143
|
143
|
}
|
|
144
|
144
|
return ImmutableMap.copyOf(mappingBuilder);
|
|
145
|
145
|
}
|
|
|
146
|
+ private DecoratorService decoratorService;
|
|
|
147
|
+
|
|
|
148
|
+ @Override
|
|
|
149
|
+ public void setServiceContext(ObserveServiceContextLocal serviceContext) {
|
|
|
150
|
+ super.setServiceContext(serviceContext);
|
|
|
151
|
+ decoratorService = new DecoratorService(ConsolidateDataServiceLocal.this::getReferentialLocale);
|
|
|
152
|
+ }
|
|
146
|
153
|
|
|
147
|
154
|
@Override
|
|
148
|
155
|
public ConsolidateTripSeineDataResult consolidateTripSeine(SimplifiedObjectTypeSpecializedRules simplifiedObjectTypeSpecializedRules, ConsolidateTripSeineDataRequest request) {
|
| ... |
... |
@@ -154,7 +161,6 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
|
154
|
161
|
SimplifiedObjectTypeManager simplifiedObjectTypeManager = newSimplifiedObjectTypeManager(simplifiedObjectTypeSpecializedRules);
|
|
155
|
162
|
|
|
156
|
163
|
FloatingObjectConsolidateEngine floatingObjectConsolidateEngine = new FloatingObjectConsolidateEngine(simplifiedObjectTypeManager);
|
|
157
|
|
- DecoratorService decoratorService = DecoratorServiceApplicationComponent.value();
|
|
158
|
164
|
Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(decoratorService,referenceLocale, floatingObjectConsolidateEngine, request.getTripSeineId(), failIfLengthWeightParameterNotFound, failIfLengthLengthParameterNotFound);
|
|
159
|
165
|
return consolidateTripSeineDataResult.orElse(null);
|
|
160
|
166
|
}
|