Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 9aa60a6d by Tony Chemit at 2023-01-18T14:06:47+01:00 Revue du remplissage de activity.setCount - Closes #2610 - - - - - 1 changed file: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -226,32 +226,38 @@ public class ActivityReader extends DataReader<Activity> { // 11 - V_TMER on route // 12 - V_TPEC on route String vesselActivityCode = resultSet.getString(13); + Object setCountObject = resultSet.getObject(14); + Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue(); switch (vesselActivityCode) { case "0": // SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus0()); entity.setReasonForNullSet(dataContext.getReasonForNullSet0()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "1": // SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "2": // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429) // SetSuccessStatus=2 entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); // Add Observed system 110 entity.addObservedSystem(dataContext.getObservedSystem110()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; } entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode)); - Object setCount = resultSet.getObject(14); - if (setCount != null) { - entity.setSetCount(((Number) setCount).intValue()); - } String schoolTypeCode = resultSet.getString(15); entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); Object fDonOrg = resultSet.getObject(16); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9aa60a6d950fbda5002383f441... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9aa60a6d950fbda5002383f441... You're receiving this email because of your account on gitlab.com.