Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
7c66455f
by Tony Chemit at 2023-01-25T09:36:04+01:00
-
02e11b30
by Tony Chemit at 2023-01-25T09:36:34+01:00
2 changed files:
- core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java
- core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java
Changes:
| ... | ... | @@ -76,19 +76,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 76 | 76 | .put("0", "99")
|
| 77 | 77 | .put("1", "99")
|
| 78 | 78 | .put("2", "99")
|
| 79 | - .put("3", "99")
|
|
| 80 | - .put("4", "99")
|
|
| 81 | - .put("10", "99")
|
|
| 82 | - .put("14", "99")
|
|
| 79 | + |
|
| 80 | + .put("3", "2")
|
|
| 81 | + .put("4", "2")
|
|
| 82 | + .put("5", "1")
|
|
| 83 | + .put("6", "4")
|
|
| 84 | + |
|
| 83 | 85 | .put("7", "99")
|
| 84 | 86 | .put("8", "99")
|
| 85 | 87 | .put("9", "99")
|
| 88 | + .put("10", "99")
|
|
| 86 | 89 | .put("12", "99")
|
| 87 | 90 | .put("13", "99")
|
| 91 | + .put("14", "99")
|
|
| 88 | 92 | .put("15", "99")
|
| 89 | 93 | |
| 90 | - .put("5", "1")
|
|
| 91 | - .put("6", "4")
|
|
| 92 | 94 | .put("22", "4")
|
| 93 | 95 | .put("23", "1")
|
| 94 | 96 | .put("24", "4")
|
| ... | ... | @@ -110,8 +112,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 110 | 112 | * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create.
|
| 111 | 113 | */
|
| 112 | 114 | public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder()
|
| 115 | + .put("3", "1") // Visite | Visite
|
|
| 116 | + .put("4", "1") // Visite | Visite
|
|
| 113 | 117 | .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau
|
| 114 | 118 | .put("6", "2") // Retrait | null ou 2 Récupération
|
| 119 | + .put("7", "1") // Visite | Visite
|
|
| 120 | + .put("10", "1")// Visite | Visite
|
|
| 121 | + .put("12", "1")// Visite | Visite
|
|
| 122 | + .put("13", "1")// Visite | Visite
|
|
| 123 | + .put("14", "1")// Visite | Visite
|
|
| 124 | + .put("15", "1")// Visite | Visite
|
|
| 115 | 125 | .put("23", "3") // Mise à l'eau | 3 Mise à l'eau
|
| 116 | 126 | .put("24", "2") // Retrait | 2 Récupération
|
| 117 | 127 | .put("25", "3") // Visite | 3 Mise à l'eau
|
| ... | ... | @@ -137,15 +147,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { |
| 137 | 147 | "2",
|
| 138 | 148 | "3",
|
| 139 | 149 | "4",
|
| 150 | + "6",
|
|
| 151 | + "7",
|
|
| 152 | + "8",
|
|
| 140 | 153 | "9",
|
| 141 | 154 | "10",
|
| 142 | 155 | "12",
|
| 156 | + "13",
|
|
| 143 | 157 | "14",
|
| 144 | 158 | "15",
|
| 145 | - "7",
|
|
| 146 | - "8",
|
|
| 147 | - "13",
|
|
| 148 | - "6",
|
|
| 149 | 159 | "22",
|
| 150 | 160 | "24",
|
| 151 | 161 | "25",
|
| ... | ... | @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes |
| 38 | 38 | import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest;
|
| 39 | 39 | import fr.ird.observe.dto.referential.I18nReferentialHelper;
|
| 40 | 40 | import fr.ird.observe.dto.referential.ReferentialLocale;
|
| 41 | -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference;
|
|
| 42 | 41 | import fr.ird.observe.entities.ObserveTopiaDaoSupplier;
|
| 43 | 42 | import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport;
|
| 44 | 43 | import fr.ird.observe.entities.data.ps.localmarket.Batch;
|
| ... | ... | @@ -178,9 +177,8 @@ public class TripConsolidateEngine { |
| 178 | 177 | |
| 179 | 178 | String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax);
|
| 180 | 179 | |
| 181 | - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty();
|
|
| 182 | - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) {
|
|
| 183 | - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId()));
|
|
| 180 | + if (activity.getSetSize() == 0) {
|
|
| 181 | + log.info(String.format("%s Skip activity (No set found): %s", activityPrefix, activity.getTopiaId()));
|
|
| 184 | 182 | continue;
|
| 185 | 183 | }
|
| 186 | 184 |