| ... |
... |
@@ -226,32 +226,38 @@ public class ActivityReader extends DataReader<Activity> { |
|
226
|
226
|
// 11 - V_TMER on route
|
|
227
|
227
|
// 12 - V_TPEC on route
|
|
228
|
228
|
String vesselActivityCode = resultSet.getString(13);
|
|
|
229
|
+ Object setCountObject = resultSet.getObject(14);
|
|
|
230
|
+ Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue();
|
|
229
|
231
|
switch (vesselActivityCode) {
|
|
230
|
232
|
case "0":
|
|
231
|
233
|
// SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
|
232
|
234
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus0());
|
|
233
|
235
|
entity.setReasonForNullSet(dataContext.getReasonForNullSet0());
|
|
|
236
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
|
237
|
+ entity.setSetCount(setCount);
|
|
234
|
238
|
break;
|
|
235
|
239
|
case "1":
|
|
236
|
240
|
// SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
|
237
|
241
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1());
|
|
|
242
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
|
243
|
+ entity.setSetCount(setCount);
|
|
238
|
244
|
break;
|
|
239
|
245
|
case "2":
|
|
240
|
246
|
// SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
|
241
|
247
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
|
|
|
248
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
|
249
|
+ entity.setSetCount(setCount);
|
|
242
|
250
|
break;
|
|
243
|
251
|
case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429)
|
|
244
|
252
|
// SetSuccessStatus=2
|
|
245
|
253
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
|
|
246
|
254
|
// Add Observed system 110
|
|
247
|
255
|
entity.addObservedSystem(dataContext.getObservedSystem110());
|
|
|
256
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
|
257
|
+ entity.setSetCount(setCount);
|
|
248
|
258
|
break;
|
|
249
|
259
|
}
|
|
250
|
260
|
entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode));
|
|
251
|
|
- Object setCount = resultSet.getObject(14);
|
|
252
|
|
- if (setCount != null) {
|
|
253
|
|
- entity.setSetCount(((Number) setCount).intValue());
|
|
254
|
|
- }
|
|
255
|
261
|
String schoolTypeCode = resultSet.getString(15);
|
|
256
|
262
|
entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
257
|
263
|
Object fDonOrg = resultSet.getObject(16);
|