Merge pull request #113 from seehase/feature/sunny_multi_importer

Feature/sunny multi importer

Author: seehausen

.gitignore

@@ -14,3 +14,4 @@
 .DS_Store
 /ZonPHP/parameters_dev.php
 /.vscode/
+/ZonPHP/WR**/

ZonPHP/charts/months_chart.php

@@ -119,7 +119,7 @@
 
     // collect data for max bars
     for ($i = 1; $i <= 12; $i++) {
-        $cnt_per_month[$i] = 0;
+        $cnt_per_month[$i] = 1;
         if (!isset($maxPerMonth[$i][$inverter_name])) {
             $maxPerMonth[$i][$inverter_name] = 0;
         }

ZonPHP/charts/year_chart.php

@@ -47,6 +47,12 @@
 $resultmax = mysqli_query($con, $sqlmax) or die("Query failed. jaar-max " . mysqli_error($con));
 
 $maxPerMonth = array();
+
+foreach ($params['PLANTS'] as $name => $plant) {
+    for ($k = 1; $k <= 12; $k++) {
+        $maxPerMonth[$k][$name] = 0.0;
+    }
+}
 if (mysqli_num_rows($resultmax) > 0) {
     while ($row = mysqli_fetch_array($resultmax)) {
         $maxPerMonth[$row['maand']][$row['Name']] = $row['som'];

ZonPHP/importer/sunny_explorer_marcel.php

@@ -0,0 +1,99 @@
+<?php
+global $con, $params;
+
+// Loop over all plants only one folder should contain the CSV files with values for all converters
+foreach ($params['PLANTS'] as $name => $plant) {
+    $lastImportDate = getLastImportDateForPlant($name, $con);
+    $files_to_import = getFilesToImport($name, $lastImportDate, $plant['importPrefix']);
+    $importDateFormat = $plant['importDateFormat'];
+    addDebugInfo("sunny_explorer_multi: LastStartImportDate: $lastImportDate - ImportFilesCount: " . count($files_to_import));
+
+    foreach ($files_to_import as $import_filename) {
+        addDebugInfo("sunny_explorer_multi: importFile: $import_filename");
+        $importData = readImportFile($import_filename, 0);
+        $index = 0;
+        foreach ($params['PLANTS'] as $importName => $plant) {
+            addDebugInfo("sunny_explorer_multi: importFile: $import_filename -> plant: $importName");
+            $lastImportDate = getLastImportDateForPlant($importName, $con);
+            $dbValues = mapLinesToDBValues($importData, $importName, $lastImportDate, $importDateFormat, $index);
+            prepareAndInsertData($dbValues, $con);
+            $index++;
+        }
+    }
+}
+
+function mapLinesToDBValues(array $lines, string $name, $lastImportDate, $importDateFormat, $index): array
+{
+    global $params;
+    $dbValues = array();
+    $minkWhCounter = 0.0;
+    $lineCounter = 0;
+    $isFirstValueLine = true;
+    foreach ($lines as $line) {
+        $lineCounter++;
+        if ($lineCounter == 8) {
+            $importDateFormat = parseImportDateTimeFormat($line, $importDateFormat);
+        }
+        if ($lineCounter > 8) {
+            $lineValues = explode(";", $line);
+            // all values are available and not null
+            if (hasValidValues($lineValues, $index)) {
+                // first data row get initial $minkWhCounter value from first line
+                if ($isFirstValueLine) {
+                    $isFirstValueLine = false;
+                    $minkWhCounter = str_replace(',', '.', $lineValues[($index * 2) + 1]);
+                }
+                $dateFromDB = $lineValues[0];
+
+                // convert to UTC if parameter "importLocalDateAsUTC" is set to true otherwise it will remain localDate
+                if ($params['importLocalDateAsUTC']) {
+                    $convertedDate = convertLocalDateTime($dateFromDB, $importDateFormat, true); // in UTC now
+                } else {
+                    $convertedDate = $dateFromDB;  // keep local time
+                }
+                $convertedTimeStamp = convertToUnixTimestamp($convertedDate);
+                $currentTimeStamp = date("Y-m-d H:i:s", $convertedTimeStamp);
+                $currentkWhCounter = str_replace(',', '.', $lineValues[($index * 2) + 1]);
+                $cummulatedkWh = round($currentkWhCounter - $minkWhCounter, 3);
+                $currentWatt = 0;
+                $currentWattStr = trim(str_replace(',', '.', $lineValues[($index * 2) + 2]));
+                if (strlen($currentWattStr) > 0 && is_numeric($currentWattStr)) {
+                    $currentWatt = $currentWattStr * 1000;
+                }
+
+                // insert only new data and value > 0
+                if ($currentWatt > 0 && ($currentTimeStamp != "") && (strtotime($currentTimeStamp) > strtotime($lastImportDate))) {
+                    $dbValues[] = array('name' => $name, 'timestamp' => $currentTimeStamp, 'watt' => $currentWatt, 'cummulatedkWh' => round($cummulatedkWh, 3));
+                }
+
+            }
+        }
+    }
+    addDebugInfo("sunny_explorer: mapLinesToDBValues: ImportedLines: " . count($lines) . " - DataRows: " . count($dbValues));
+    return $dbValues;
+}
+
+/**
+ * Try to parse dateformat from CSV wich is normaly written in line 9
+ * dd.MM.yyyy HH:mm:ss;kWh;kW
+ * -->  "d.m.Y H:i:s"
+ */
+function parseImportDateTimeFormat(string $line, string $default): string
+{
+    $parts = explode(";", $line);
+    if (count($parts) > 0) {
+        $format = $parts[0];
+        $format = str_replace("dd", "d", $format);
+        $format = str_replace("MM", "m", $format);
+        $format = str_replace("yyyy", "Y", $format);
+        $format = str_replace("HH", "H", $format);
+        $format = str_replace("mm", "i", $format);
+        $format = str_replace("ss", "s", $format);
+        addDebugInfo("parseImportDateTimeFormat: parsed import format from CSV: $line -> $format");
+        return $format;
+    } else {
+        addDebugInfo("parseImportDateTimeFormat: cannot parse import format from CSV: $line using default: $default override in [plant][importDateFormat] if needed");
+        return $default;
+    }
+
+}