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

Исправлен баг графиков, работает расширитель

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-02 01:06:25 +02:00
parent ebc9c10bcd
commit 31b83e8380
17 changed files with 137 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/modules/virtual/Loging/Loging.cpp
View File

@@ -177,12 +177,12 @@ class Loging : public IoTItem {
if (fileUnixTimeLocal > reqUnixTime && fileUnixTimeLocal < reqUnixTime + 86400) {
noData = false;
if (_publishType == TO_MQTT) {
publishChartFileToMqtt(path);
publishChartFileToMqtt(path, id, calculateMaxCount());
} else if (_publishType == TO_WS) {
publishChartToWs(path, _wsNum, 1000);
publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} else if (_publishType == TO_MQTT_WS) {
publishChartFileToMqtt(path);
publishChartToWs(path, _wsNum, 1000);
publishChartFileToMqtt(path, id, calculateMaxCount());
publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
}
SerialPrint("i", F("Loging"), String(f) + ") " + path + ", " + getDateTimeDotFormatedFromUnix(fileUnixTimeLocal) + ", sent");
} else {
@@ -224,61 +224,6 @@ class Loging : public IoTItem {
}
}
bool publishChartFileToMqtt(String path) {
File configFile = FileFS.open(path, FILE_READ);
if (!configFile) {
SerialPrint("E", F("Loging"), path + " file reading error, json not created, return");
return false;
}
String oneSingleJson = configFile.readString();
configFile.close();
String topic = mqttRootDevice + "/" + id;
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
SerialPrint("i", "Loging", "json size: " + String(oneSingleJson.length()));
publishChartMqtt(id, oneSingleJson);
return true;
}
//особая функция отправки графиков в веб
void publishChartToWs(String filename, int num, size_t frameSize) {
String json;
jsonWriteStr(json, "topic", mqttRootDevice + "/" + id);
jsonWriteInt(json, "maxCount", calculateMaxCount());
String st = "/st/chart.json|";
if (num == -1) {
standWebSocket.broadcastTXT(st);
} else {
standWebSocket.sendTXT(num, st);
}
String path = filepath(filename);
auto file = FileFS.open(path, "r");
if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error"));
return;
}
size_t fileSize = file.size();
SerialPrint(F("i"), F("FS"), "Send file '" + String(filename) + "', file size: " + String(fileSize));
uint8_t payload[frameSize];
int countRead = file.read(payload, sizeof(payload));
while (countRead > 0) {
if (num == -1) {
standWebSocket.broadcastBIN(payload, countRead);
} else {
standWebSocket.sendBIN(num, payload, countRead);
}
countRead = file.read(payload, sizeof(payload));
}
file.close();
String end = "/end/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(end);
} else {
standWebSocket.sendTXT(num, end);
}
}
void clearValue() {
String topic = mqttRootDevice + "/" + id;
String json = "{\"maxCount\":0,\"topic\":\"" + topic + "\",\"status\":[]}";

70
src/modules/virtual/LogingDaily/LogingDaily.cpp
View File

@@ -14,6 +14,8 @@ class LogingDaily : public IoTItem {
int points;
int testMode;
IoTItem *dateIoTItem;
String prevDate = "";
@@ -26,6 +28,7 @@ class LogingDaily : public IoTItem {
jsonRead(parameters, F("logid"), logid);
jsonRead(parameters, F("id"), id);
jsonRead(parameters, F("points"), points);
jsonRead(parameters, F("test"), testMode);
if (points > 365) {
points = 365;
@@ -36,7 +39,7 @@ class LogingDaily : public IoTItem {
}
void doByInterval() {
if (hasDayChanged()) {
if (hasDayChanged() || testMode == 1) {
execute();
}
}
@@ -72,7 +75,7 @@ class LogingDaily : public IoTItem {
float difference = currentValue - prevValue;
jsonWriteInt(logData, "x", unixTime);
jsonWriteInt(logData, "x", unixTime - 120);
jsonWriteFloat(logData, "y1", difference);
//прочитаем путь к файлу последнего сохранения
@@ -167,12 +170,12 @@ class LogingDaily : public IoTItem {
f++;
if (_publishType == TO_MQTT) {
publishChartFileToMqtt(path);
publishChartFileToMqtt(path, id, calculateMaxCount());
} else if (_publishType == TO_WS) {
publishChartToWs(path, _wsNum, 1000);
publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
} else if (_publishType == TO_MQTT_WS) {
publishChartFileToMqtt(path);
publishChartToWs(path, _wsNum, 1000);
publishChartFileToMqtt(path, id, calculateMaxCount());
publishChartToWs(path, _wsNum, 1000, calculateMaxCount(), id);
}
SerialPrint("i", F("LogingDaily"), String(f) + ") " + path + ", sent");
@@ -185,61 +188,6 @@ class LogingDaily : public IoTItem {
cleanDirectory(dir);
}
bool publishChartFileToMqtt(String path) {
File configFile = FileFS.open(path, FILE_READ);
if (!configFile) {
SerialPrint("E", F("LogingDaily"), path + " file reading error, json not created, return");
return false;
}
String oneSingleJson = configFile.readString();
configFile.close();
String topic = mqttRootDevice + "/" + id;
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
SerialPrint("i", "LogingDaily", "json size: " + String(oneSingleJson.length()));
publishChartMqtt(id, oneSingleJson);
return true;
}
//особая функция отправки графиков в веб
void publishChartToWs(String filename, int num, size_t frameSize) {
String json;
jsonWriteStr(json, "topic", mqttRootDevice + "/" + id);
jsonWriteInt(json, "maxCount", calculateMaxCount());
String st = "/st/chart.json|";
if (num == -1) {
standWebSocket.broadcastTXT(st);
} else {
standWebSocket.sendTXT(num, st);
}
String path = filepath(filename);
auto file = FileFS.open(path, "r");
if (!file) {
SerialPrint(F("E"), F("FS"), F("reed file error"));
return;
}
size_t fileSize = file.size();
SerialPrint(F("i"), F("FS"), "Send file '" + String(filename) + "', file size: " + String(fileSize));
uint8_t payload[frameSize];
int countRead = file.read(payload, sizeof(payload));
while (countRead > 0) {
if (num == -1) {
standWebSocket.broadcastBIN(payload, countRead);
} else {
standWebSocket.sendBIN(num, payload, countRead);
}
countRead = file.read(payload, sizeof(payload));
}
file.close();
String end = "/end/chart.json|" + json;
if (num == -1) {
standWebSocket.broadcastTXT(end);
} else {
standWebSocket.sendTXT(num, end);
}
}
void publishChartToWsSinglePoint(String value) {
String topic = mqttRootDevice + "/" + id;
String json = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[{\"x\":" + String(unixTime) + ",\"y1\":" + value + "}]}";

6
src/modules/virtual/LogingDaily/modinfo.json
View File

@@ -12,7 +12,8 @@
"num": 1,
"int": 1,
"logid": "t",
"points": 365
"points": 365,
"test": 0
}
],
"about": {
@@ -28,7 +29,8 @@
"propInfo": {
"int": "Интервал логирования в мнутах, частота проверки смены суток в минутах. Не рекомендуется менять",
"logid": "ID накопительной величины которую будем логировать",
"points": "Максимальное количество точек"
"points": "Максимальное количество точек",
"test": "Режим тестирования - график будет обновляться не раз в сутки, а кадый заданный в int интервал"
}
},
"defActive": true,