Browse Source

refactor IMA

Lukas Cerny 5 years ago
parent
commit
3317cc319c

+ 9 - 9
config/lorawanSenslog1.yaml

@@ -8,7 +8,7 @@ settings:
     - AzureLoraWan:
         name: "IoT LoraWan"
         provider: "cz.senslog.connector.fetch.azure.ConnectorFetchAzureProvider"
-        startDate: 2020-03-11T09:00:00.000
+        startDate: 2020-03-13T19:30:00.000
         # endDate: 2020-03-11T09:00:00.000
         limitPerSensor: 100
 
@@ -28,12 +28,12 @@ settings:
             password: "SensLogIMA1"
             refreshPeriodIfFail: 10000
 
-#        sessionProxy:
-#            user: "afarcloud"
-#            group: "afc"
-#            lastObservationHost:
-#              <<: *senslogApiDomain
-#              path: "SensorService"
+        sessionProxy:
+            user: "afarcloud"
+            group: "afc"
+            lastObservationHost:
+              <<: *senslogApiDomain
+              path: "SensorService"
         
     - SenslogV1:
         name: "Senslog V1"
@@ -46,5 +46,5 @@ connectors:
     - AzureSenslogV1:
         fetcher: "AzureLoraWan"
         pusher: "SenslogV1"
-        period: 30
-        initDelay: 30
+        period: 600
+        initDelay: 10

+ 5 - 5
connector-model/src/main/java/cz/senslog/connector/model/azure/SensorType.java

@@ -10,12 +10,12 @@ package cz.senslog.connector.model.azure;
  */
 public enum SensorType {
 
-    TEMPERATURE     (340020000), // 10002376: 2020-03-11 10:05:37+01  10002222: 2020-02-10 06:32:57+01
-    HUMIDITY        (410010000), // 10002376: 2020-03-11 10:05:37+01  10002222: 2020-02-10 06:32:57+01
+    TEMPERATURE     (340020000),
+    HUMIDITY        (410010000),
     CO2             (780020000),
-    RSSI            (380010000), // 10002376: 2020-03-11 10:05:37+01  10002222: 2020-02-10 06:32:57+01
-    SNR             (380090000), // 10002376: 2020-03-11 10:05:37+01  10002222: 2020-02-10 06:32:57+01
-    BATTERY_LEVEL   (560030000), // 10002376: 2020-03-11 10:05:37+01  10002222: 2020-02-10 06:32:57+01
+    RSSI            (380010000),
+    SNR             (380090000),
+    BATTERY_LEVEL   (560030000),
 
     ;
     private final long id;

+ 1 - 1
connector-model/src/main/java/cz/senslog/connector/model/converter/AzureUnitConverter.java

@@ -8,7 +8,7 @@ import java.util.Map;
  */
 public class AzureUnitConverter {
 
-    private static Map<String, Long> CONVERT_TABLE;
+    private static final Map<String, Long> CONVERT_TABLE;
 
     static {
         CONVERT_TABLE = new HashMap<>();