@@ -1,6 +1,7 @@

 #!/usr/bin/perl

 # parser pentru mesajele MQTT

-# Version: 1.0.1

+# Version: 1.0.2

+

 use strict;

 use warnings;

 use JSON qw( decode_json );

@@ -43,24 +44,48 @@ while( my $line = <$CFG>){

 close $CFG;

 my $dbh = DBI->connect("DBI:mysql:$db:$dbhost", $dbuser, $dbpass);

-open(my $SUB, "/usr/bin/mosquitto_sub -u $mqttuser -P $mqttpass -v -t \"stat/#\" |");

+open(my $SUB, "/usr/bin/mosquitto_sub -u $mqttuser -P $mqttpass -v -t \"#\" |");

 while (my $mqttMessage = <$SUB> ) {

-  # spargem mqttMessage in doua, dupa prima { si obtinem canalul si json-ul:

-  my $channel = substr($mqttMessage, 0, index("$mqttMessage", '{'));

-  my $json = substr($mqttMessage, index("$mqttMessage", '{'), -1);

-  # spargem canalul: stat/esrqtsa-3434/ESP

-  (my $root, my $topic, my $queue) = split /\//, $channel;

-  # de obicei, exista un spatiu dupa afisarea canalului si-i fac remove

-  $queue=~ s/\ //g;

-  # cu mesajele care vin pe stat/+/ESP si contin in json Temp fac grafice

-  if ($queue eq "ESP"){

-    my $decoded = decode_json($json);

-    my $temp=$decoded->{'Temp'};

-    colect ($topic, 'Temp', $temp);

-    my $query = "insert into mqttparser values (?, ?, ?)";

-    my $sqlQuery  = $dbh->prepare($query) or die "Can't prepare $query: $dbh->errstr\n";

-    $sqlQuery->execute('0', $decoded->{'Temp'}, '101');

-    $sqlQuery->finish();

+  my $start = substr($mqttMessage, 0, 4);

+  # prelucrez doar mesajele de pe canalele stat/# sau tele/#

+  if (($start eq "stat")||($start eq "tele")){

+    if (index($mqttMessage, "{") == -1) {

+      #print "Mesajul nu contine json, il sparg dupa spatiu\n"

+      (my $channel, my $nonjson) = split /\ /, $mqttMessage, 2;

+      (my $root, my $topic, my $queue) = split /\//, $channel;

+      # aleg canalele de unde salvez date in DB:

+      if ($queue eq "LWT"){

+        getdevinfoFILE ($topic, "LWT", $nonjson);

+        getdevinfoDB ($topic, "LWT", $nonjson);

+      }

+      else {

+        #print "nu ma intereseaza alte canale fara json";

+      }

+    }

+    else {

+      #print "Mesajul contine json, il sparg dupa {\n"; 

+      my $channel = substr($mqttMessage, 0, index("$mqttMessage", '{'));

+      $channel=~ s/\ //g; # sterg ultimul spatiu

+      (my $root, my $topic, my $queue) = split /\//, $channel;

+      my $json = substr($mqttMessage, index("$mqttMessage", '{'), rindex("$mqttMessage", '}'));      

+

+      # aleg canalele de unde salvez date in DB:

+      if ($queue eq "ENERGY"){

+        # tele/mng9184-1657/ENERGY {"Time":"2018-03-04T13:18:39","Total":1376.995,"Yesterday":23.704,"Today":16.450,"Period":102,"Power":1255,"Factor":0.99,"Voltage":237,"Current":5.298}

+        my $decoded = decode_json($json);

+        my $yesterday = $decoded->{'Yesterday'};

+        my $today = $decoded->{'Today'};

+        getdevinfoFILE ($topic, "Yesterday", $yesterday);

+        getdevinfoDB ($topic, "Yesterday", $yesterday);

+        getdevinfoFILE ($topic, "Today", $today);

+        getdevinfoDB ($topic, "Today", $today);

+      }

+      if ($queue eq "ESP"){

+      }

+    }

+  }

+  else {

+    #print 'Nu ma intereseaza mesajele astea!\n$mqttMessage';

   }

 }

 $dbh->disconnect;

@@ -69,19 +94,24 @@ if ($daemon==1){

   while ($continue) {

   }

 }

-sub colect {

-  (my $device, my $camp, my $val) = @_;

-  my $cale='/admin/scripts/mqtt-perl/test.txt';

-#  my $filename="test.txt";

-#  if ($camp eq "Temp"){

-#    $filename="temperatura.txt";

-#  }

-#  if ($camp eq "Humi"){

-#    $filename="umiditate.txt";

-#  }

-  my $cale_fisier=$cale;

-  open (my $fh, '>>', $cale_fisier) or die "Cannot open";

-  print $fh "valoare - topic: $val - $device\n";

+

+sub getdevinfoFILE {

+  (my $topic, my $camp, my $valoare) = @_;

+  my $cale='/admin/scripts/mqtt-perl/mqttparser.devel.txt';

+  my $tm=localtime;

+  open (my $fh, '>>', $cale) or die "Cannot open";

+  (my $user, my $devid) = split /\-/, $topic;

+  print $fh "$tm: Update FILE getdevinfo: $user - $devid - $camp - $valoare\n";

   close $fh;

   return;

 }

+

+sub getdevinfoDB {                                                    

+  (my $topic, my $camp, my $valoare) = @_;

+   my $query = "insert into mqttparser values (?, ?, ?)";

+   my $sqlQuery  = $dbh->prepare($query) or die "Can't prepare $query: $dbh->errstr\n";

+   my $tm=localtime;

+   (my $user, my $devid) = split /\-/, $topic;

+   $sqlQuery->execute('0', "$tm", "$user - $devid - $camp - $valoare");

+  return;

+}