iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 20:09:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправляем логическую ошибку при которой события приходящие из вне генерировали дубликаты Item

Browse Source
This commit is contained in:
biver
2022-06-02 23:22:11 +03:00
parent 72c36a25a7
commit 74decadee5
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MqttClient.cpp
View File

@@ -127,6 +127,8 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
//SerialPrint("i", "=>MQTT", payloadStr); //SerialPrint("i", "=>MQTT", payloadStr);
//SerialPrint("i", F("=>MQTT"), "Msg from iotmanager: " + topicStr);
if (payloadStr.startsWith("HELLO")) { if (payloadStr.startsWith("HELLO")) {
SerialPrint("i", F("MQTT"), F("Full update")); SerialPrint("i", F("MQTT"), F("Full update"));
publishWidgets(); publishWidgets();
@@ -153,8 +155,19 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
if (topicStr.indexOf(chipId) == -1) { if (topicStr.indexOf(chipId) == -1) {
String devId = selectFromMarkerToMarker(topicStr, "/", 2); String devId = selectFromMarkerToMarker(topicStr, "/", 2);
String id = selectFromMarkerToMarker(topicStr, "/", 3); String id = selectFromMarkerToMarker(topicStr, "/", 3);
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)); IoTItems.push_back((IoTItem*)new externalVariable(payloadStr));
}
//запустим проверку его в сценариях //запустим проверку его в сценариях
generateEvent(id, payloadStr); generateEvent(id, payloadStr);
SerialPrint("i", F("=>MQTT"), "Received event from other device: '" + devId + "' " + id + " " + payloadStr); SerialPrint("i", F("=>MQTT"), "Received event from other device: '" + devId + "' " + id + " " + payloadStr);