Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 70170fc0 by tchemit at 2020-04-17T11:58:23+02:00 FOB sans objectOperation fait planter la consolidation des données (Afficher les FOB sans objectOperation) - See #1469 - - - - - 2 changed files: - − persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/FloatingObjectTopiaDao.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/FloatingObjectTopiaDao.java deleted ===================================== @@ -1,99 +0,0 @@ -package fr.ird.observe.entities.data.ps.observation; - -/* - * #%L - * ObServe :: Persistence - * %% - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.dto.referential.I18nReferentialHelper; -import fr.ird.observe.entities.referential.ps.common.ObjectOperation; -import fr.ird.observe.entities.referential.ps.common.ObjectOperationImpl; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<FloatingObject> { - - public List<FloatingObject> findAllStubByActivityId(String activityId, int referenceLocale) { - - return StubSqlQuery.findAll(topiaSqlSupport, activityId, referenceLocale); - - } - - private static class StubSqlQuery extends TopiaSqlQuery<FloatingObject> { - - private final String sql; - - private final String id; - - private final int referenceLocale; - - static List<FloatingObject> findAll(TopiaSqlSupport context, String activityId, int referenceLocale) { - - String sql = "SELECT" + - " fo.topiaId," + - " ot." + I18nReferentialHelper.getPropertyName(referenceLocale) + - " FROM ps_observation.floatingobject fo, ps_common.objectOperation ot" + - " WHERE " + - " fo.activity = ?" + - " AND fo.objectOperation = ot.topiaid" + - " ORDER BY ot." + I18nReferentialHelper.getPropertyName(referenceLocale); - - StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); - return context.findMultipleResult(request); - - } - - StubSqlQuery(String sql, String id, int referenceLocale) { - this.sql = sql; - this.id = id; - this.referenceLocale = referenceLocale; - } - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, id); - return preparedStatement; - } - - @Override - public FloatingObject prepareResult(ResultSet set) throws SQLException { - - FloatingObject floatingObject = new FloatingObjectImpl(); - floatingObject.setTopiaId(set.getString(1)); - - String objectTypeLabel = set.getString(2); - ObjectOperation objectType = new ObjectOperationImpl(); - I18nReferentialHelper.setLabel(referenceLocale, objectType, objectTypeLabel); - floatingObject.setObjectOperation(objectType); - - return floatingObject; - - } - - } - -} ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocal.java ===================================== @@ -48,7 +48,6 @@ import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOperation; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOwnership; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType; import fr.ird.observe.entities.referential.ps.observation.ObjectMaterial; -import fr.ird.observe.entities.referential.ps.observation.ObjectMaterialTopiaDao; import fr.ird.observe.entities.referential.ps.observation.ObservedSystem; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.ps.observation.FloatingObjectService; @@ -76,16 +75,14 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F @Override public ObjectMaterialHierarchyDto getObjectMaterialHierarchy() { - ObjectMaterialTopiaDao dao = getTopiaPersistenceContext().getPsObservationObjectMaterialDao(); - List<ObjectMaterial> objectMaterials = dao.findAll(); + List<ObjectMaterial> objectMaterials = ObjectMaterial.getDao(getTopiaPersistenceContext()).findAll(); objectMaterials.sort(Comparator.comparing(ObjectMaterial::getCode)); return getObjectMaterialHierarchyDtos(objectMaterials).get(0); } @Override public DataDtoReferenceSet<FloatingObjectReference> getFloatingObjectByActivitySeine(String activitySeineId) { - ReferentialLocale referenceLocale = getReferentialLocale(); - List<FloatingObject> entities = FloatingObject.getDao(getTopiaPersistenceContext()).findAllStubByActivityId(activitySeineId, referenceLocale.ordinal()); + Set<FloatingObject> entities = Activity.loadEntity(getTopiaPersistenceContext(), activitySeineId).getFloatingObject(); return FloatingObject.toReferenceSet(entities, getReferentialLocale()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/70170fc0fb94f61521e59e54f9... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/70170fc0fb94f61521e59e54f9... You're receiving this email because of your account on gitlab.com.