„edldata.sql“ ändern

Tabelle für Snapshot und Tageswerte hinzugefügt.

edl21.sh

@@ -2,8 +2,6 @@
 # edl21.sh reads data from the EDL21 electricity meter and writes it up to a MySQL/MariaDB.
 # https://code.hw12.org/tilman/edl21
 #
-# Version 0.6 - 05.06.2019
-#
 # License GPL3.0 or later
 # https://code.hw12.org/tilman/edl21/src/branch/master/LICENSE
 
@@ -21,7 +19,8 @@ DB_USER="dbuser";
 DB_PASS="dbpasswd";
 DB_HOST="dbhost";
 DB_NAME="dbname";
-DB_TAB="dbtable";
+DB_TAB="EdlData";
+DB_TAB_SNAP="EdlSnapshot";
 
 #Get date and round to nearest 5min (for harmonized use with data from other scripts in pChart)
 DATE_RAW=$(/bin/date +%s);
@@ -105,7 +104,8 @@ echo $DATE";"$DATE_N5M";"$STRING_180";"$STRING_280";"$STRING_PWR_IN";"$STRING_PW
 
 #Send data to database
 mysql -u $DB_USER -p$DB_PASS -h $DB_HOST -D $DB_NAME <<EOF
-INSERT INTO $DB_TAB (TimeStamp,Nearest5min,zaehlerstand_in,zaehlerstand_out,active_in,active_out) VALUES ('$DATE','$DATE_N5M','$STRING_180','$STRING_280','$STRING_PWR_IN','$STRING_PWR_OUT');
+INSERT INTO $DB_TAB (TimeStamp,Nearest5min,zaehlerstand_in,zaehlerstand_out,active_in,active_out) VALUES ('${DATE}','${DATE_N5M}','${STRING_180}','${STRING_280}','${STRING_PWR_IN}','${STRING_PWR_OUT}');
+UPDATE $DB_TAB_SNAP SET TimeStamp='${DATE}',Nearest5min='${DATE_N5M}',zaehlerstand_in='${STRING_180}',zaehlerstand_out='${STRING_280}',active_in='${STRING_PWR_IN}',active_out='${STRING_PWR_OUT}';
 EOF
 
 #Delete temporary file

edldata.sql

@@ -1,3 +1,17 @@
+--
+-- Tabellenstruktur für Tabelle `DayData`
+--
+
+CREATE TABLE `DayData` (
+  `TimeStamp` datetime NOT NULL,
+  `zaehlerstand_in` float NOT NULL,
+  `zaehlerstand_out` float NOT NULL,
+  `active_in` float NOT NULL,
+  `active_out` float NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- Tabellenstruktur für Tabelle `EdlData`
 --
@@ -11,17 +25,40 @@ CREATE TABLE `EdlData` (
   `active_out` float NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `EdlSnapshot`
+--
+
+CREATE TABLE `EdlSnapshot` (
+  `TimeStamp` datetime NOT NULL,
+  `Nearest5min` datetime NOT NULL,
+  `zaehlerstand_in` float NOT NULL,
+  `zaehlerstand_out` float NOT NULL,
+  `active_in` float NOT NULL,
+  `active_out` float NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 --
 -- Indizes der exportierten Tabellen
 --
 
+--
+-- Indizes für die Tabelle `DayData`
+--
+ALTER TABLE `DayData`
+  ADD KEY `TimeStamp` (`TimeStamp`);
+
 --
 -- Indizes für die Tabelle `EdlData`
 --
 ALTER TABLE `EdlData`
   ADD UNIQUE KEY `TimeStamp` (`TimeStamp`);
-COMMIT;
 
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+--
+-- Indizes für die Tabelle `EdlSnapshot`
+--
+ALTER TABLE `EdlSnapshot`
+  ADD UNIQUE KEY `TimeStamp` (`TimeStamp`);
+COMMIT;