Lukas Cerny 5 rokov pred
rodič
commit
12621b1c61

+ 3 - 3
config/senslog1AFarCloud.yaml

@@ -7,8 +7,8 @@ settings:
         api: &apiDomain
             domain: "http://foodie.lesprojekt.cz:8080/MapLogOT"
 
-        startDate: 1960-07-14T13:50:00.000
-        interval: 5 # hours
+        startDate: 2020-01-01T00:00:00.000
+        interval: 2 # hours
 
         user: "afarcloud"
         group: "afc"
@@ -50,4 +50,4 @@ connectors:
         fetcher: "Senslog"
         pusher: "AFC"
         period: 600
-        initDelay: 5
+        initDelay: 1

+ 1 - 1
connector-fetch-senslog-v1/src/main/java/cz/senslog/connector/fetch/senslog/v1/SenslogFetcher.java

@@ -138,7 +138,7 @@ public class SenslogFetcher implements ConnectorFetcher<SensLogSession, SenslogV
                     continue;
                 }
 
-                logger.info("Getting new observations from {} to {}.", fromDate, toDate);
+                logger.info("Getting new observations for the unit {} and the sensor {} from {} to {}.", unit.getUnitId(), sensor.getSensorId(), fromDate, toDate);
 
                 final HostConfig sensorServiceHost = config.getSensorServiceHost();
                 final DateTimeFormatter pattern = ofPattern("yyyy-MM-dd HH:mm:ssZ");

+ 8 - 2
connector-model/src/main/java/cz/senslog/connector/model/converter/SenslogV1ModelAFarCloudModelConverter.java

@@ -51,14 +51,20 @@ public final class SenslogV1ModelAFarCloudModelConverter implements Converter<Se
         MultiSimpleObservation result = new MultiSimpleObservation();
 
         String resourceId = sensLogUnitIdToAfcResourceId(unitInfo.getUnitId());
-        if (resourceId == null) { return null; }
+        if (resourceId == null) {
+            logger.warn("Can not find resourceId for the unitId '{}'.", unitInfo.getUnitId());
+            return null;
+        }
 
         result.setResourceId(resourceId);
         result.setObservations(new ArrayList<>(observations.size()));
 
         for (Observation observation : observations) {
             String observedProperty = sensLogSensorIdToAfcObservedProperty(unitInfo.getUnitId(), observation.getSensorId());
-            if (observedProperty == null) { continue; }
+            if (observedProperty == null) {
+                logger.warn("Can not find observedProperty for the sensorId '{}'.", observation.getSensorId());
+                continue;
+            }
 
             SimpleObservation sObs = new SimpleObservation();
             sObs.setObservedProperty(observedProperty);