From 74decadee5074903b2ec3484be56370ff97d5f39 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Thu, 2 Jun 2022 23:22:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=87=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BA=D1=83=D1=8E=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=D1=85=D0=BE=D0=B4=D1=8F=D1=89=D0=B8=D0=B5=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20=D0=B2=D0=BD=D0=B5=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=D0=B8=20=D0=B4=D1=83=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=82=D1=8B=20Item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MqttClient.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp
index 805393d0..955033b7 100644
--- a/src/MqttClient.cpp
+++ b/src/MqttClient.cpp
@@ -125,7 +125,9 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
         payloadStr += (char)payload[i];
     }
 
-    // SerialPrint("i", "=>MQTT", payloadStr);
+    //SerialPrint("i", "=>MQTT", payloadStr);
+
+    //SerialPrint("i", F("=>MQTT"), "Msg from iotmanager: " + topicStr);
 
     if (payloadStr.startsWith("HELLO")) {
         SerialPrint("i", F("MQTT"), F("Full update"));
@@ -153,8 +155,19 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
         if (topicStr.indexOf(chipId) == -1) {
             String devId = selectFromMarkerToMarker(topicStr, "/", 2);
             String id = selectFromMarkerToMarker(topicStr, "/", 3);
-            //добавим событие в базу
-            IoTItems.push_back((IoTItem*)new externalVariable(payloadStr));
+            IoTItem* itemExist = findIoTItem(id);
+            if (itemExist) {
+                String valAsStr;
+                if (jsonRead(payloadStr, F("val"), valAsStr, false)) {
+                    itemExist->setValue(valAsStr);
+                    unsigned long interval;
+                    jsonRead(payloadStr, F("int"), interval);
+                    itemExist->setInterval(interval);
+                }
+            } else {
+                //добавим событие в базу
+                IoTItems.push_back((IoTItem*)new externalVariable(payloadStr));
+            }
             //запустим проверку его в сценариях
             generateEvent(id, payloadStr);
             SerialPrint("i", F("=>MQTT"), "Received event from other device: '" + devId + "' " + id + " " + payloadStr);