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

.

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-08-25 15:23:34 +02:00
parent f90176879f
commit 71c4fb5651
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MqttClient.cpp
View File

@@ -327,12 +327,12 @@ void sendAllFilesToMQTT() {
String id = selectToMarker(fname, "-"); String id = selectToMarker(fname, "-");
unsigned long fileUnixTime = deleteBeforeDelimiter(deleteToMarkerLast(fname, "."), "-").toInt() + START_DATETIME; unsigned long fileUnixTime = deleteBeforeDelimiter(deleteToMarkerLast(fname, "."), "-").toInt() + START_DATETIME;
SerialPrint("I", "Loging", "found file '" + String(fileUnixTime) + "'"); SerialPrint("I", "Loging", "found file '" + fname + "'");
if (isItemExist(id)) { if (isItemExist(id)) {
//выбираем только те файлы которые входят в выбранные сутки //выбираем только те файлы которые входят в выбранные сутки
if (fileUnixTime > reqUnixTime && fileUnixTime < reqUnixTime + 86400) { if (fileUnixTime > reqUnixTime && fileUnixTime < reqUnixTime + 86400) {
SerialPrint("I", "Loging", "file sent to MQTT: '" + fname + "'"); Serial.print(", matched!");
createOneSingleJson(json_array, "/logs/" + fname); createOneSingleJson(json_array, "/logs/" + fname);
} }
} else { } else {
@@ -342,6 +342,9 @@ void sendAllFilesToMQTT() {
} }
Serial.println("final: "); Serial.println("final: ");
Serial.println(json_array); Serial.println(json_array);
//json_array = "{\"status\":[" + json_array + "]}";
//json_array.replace("},]}", "}]}");
//publishChart(topic, json_array);
} }
void createOneSingleJson(String& json_array, String file) { void createOneSingleJson(String& json_array, String file) {
@@ -374,10 +377,6 @@ void createOneSingleJson(String& json_array, String file) {
Serial.println(json_array); Serial.println(json_array);
configFile.close(); configFile.close();
// json_array = "{\"status\":[" + json_array + "]}";
// json_array.replace("},]}", "}]}");
// publishChart(topic, json_array);
} }
const String getStateStr(int e) { const String getStateStr(int e) {