2022-08-13 12:18:58 +02:00
|
|
|
|
#include "Global.h"
|
|
|
|
|
|
#include "classes/IoTItem.h"
|
2022-08-25 15:46:19 +02:00
|
|
|
|
#include "NTP.h"
|
2022-08-13 12:18:58 +02:00
|
|
|
|
|
|
|
|
|
|
class Loging : public IoTItem {
|
|
|
|
|
|
private:
|
2022-08-25 23:16:49 +02:00
|
|
|
|
String logid;
|
2022-08-25 00:45:17 +02:00
|
|
|
|
String id;
|
2022-09-08 00:27:38 +02:00
|
|
|
|
String filesList = "";
|
|
|
|
|
|
|
2022-08-25 15:15:06 +02:00
|
|
|
|
int points;
|
2022-08-30 00:41:27 +02:00
|
|
|
|
int keepdays;
|
2022-08-27 00:57:19 +02:00
|
|
|
|
|
2022-08-25 20:23:53 +02:00
|
|
|
|
int interval;
|
2022-08-25 23:16:49 +02:00
|
|
|
|
bool firstTime = true;
|
2022-08-13 12:18:58 +02:00
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
Loging(String parameters) : IoTItem(parameters) {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
jsonRead(parameters, F("logid"), logid);
|
2022-08-25 00:45:17 +02:00
|
|
|
|
jsonRead(parameters, F("id"), id);
|
2022-08-25 15:15:06 +02:00
|
|
|
|
jsonRead(parameters, F("points"), points);
|
2022-08-31 00:13:45 +02:00
|
|
|
|
if (points > 300) {
|
2022-08-30 00:23:06 +02:00
|
|
|
|
points = 300;
|
|
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' user set more points than allowed, value reset to 300");
|
|
|
|
|
|
}
|
2022-08-25 20:23:53 +02:00
|
|
|
|
jsonRead(parameters, F("int"), interval);
|
2022-08-30 00:41:27 +02:00
|
|
|
|
jsonRead(parameters, F("keepdays"), keepdays);
|
2022-08-25 15:15:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-25 01:52:58 +02:00
|
|
|
|
String getValue() {
|
|
|
|
|
|
return "";
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-13 12:18:58 +02:00
|
|
|
|
void doByInterval() {
|
2022-08-27 00:57:19 +02:00
|
|
|
|
//если объект логгирования не был создан
|
2022-08-25 23:16:49 +02:00
|
|
|
|
if (!isItemExist(logid)) {
|
2022-08-27 00:57:19 +02:00
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' loging object not exist");
|
2022-08-25 23:16:49 +02:00
|
|
|
|
return;
|
|
|
|
|
|
}
|
2022-08-27 00:57:19 +02:00
|
|
|
|
|
2022-08-25 23:16:49 +02:00
|
|
|
|
String value = getItemValue(logid);
|
2022-08-27 00:57:19 +02:00
|
|
|
|
//если значение логгирования пустое
|
2022-08-13 12:18:58 +02:00
|
|
|
|
if (value == "") {
|
2022-08-27 00:57:19 +02:00
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' loging value is empty");
|
2022-08-25 23:16:49 +02:00
|
|
|
|
return;
|
2022-08-27 00:57:19 +02:00
|
|
|
|
}
|
2022-08-25 00:45:17 +02:00
|
|
|
|
|
2022-08-27 00:57:19 +02:00
|
|
|
|
//если время не было получено из интернета
|
|
|
|
|
|
if (!isTimeSynch) {
|
|
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' Сant loging - time not synchronized");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// regEvent(value, F("Loging"));
|
|
|
|
|
|
|
|
|
|
|
|
String logData = String(unixTimeShort) + " " + value;
|
|
|
|
|
|
|
|
|
|
|
|
//прочитаем путь к файлу последнего сохранения
|
2022-08-27 01:24:59 +02:00
|
|
|
|
String filePath = readDataDB(id);
|
|
|
|
|
|
|
2022-08-27 00:57:19 +02:00
|
|
|
|
//если данные о файле отсутствуют, создадим новый
|
2022-08-30 00:23:06 +02:00
|
|
|
|
if (filePath == "failed" || filePath == "") {
|
2022-08-27 00:57:19 +02:00
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' file path not found");
|
|
|
|
|
|
createNewFileWithData(logData);
|
2022-08-27 01:32:31 +02:00
|
|
|
|
return;
|
2022-09-08 00:27:38 +02:00
|
|
|
|
} else {
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "' file path found " + filePath);
|
2022-08-13 12:18:58 +02:00
|
|
|
|
}
|
2022-08-27 00:57:19 +02:00
|
|
|
|
|
|
|
|
|
|
//считаем количество строк
|
2022-08-27 01:24:59 +02:00
|
|
|
|
int lines = countLines(filePath);
|
|
|
|
|
|
SerialPrint("i", F("Loging"), "'" + id + "' " + String(lines) + " lines found in file");
|
2022-08-27 00:57:19 +02:00
|
|
|
|
|
|
|
|
|
|
//если количество строк до заданной величины
|
|
|
|
|
|
if (lines <= points) {
|
|
|
|
|
|
//просто добавим в существующий файл новые данные
|
|
|
|
|
|
addNewDataToExistingFile(filePath, logData);
|
|
|
|
|
|
//если больше создадим следующий файл
|
|
|
|
|
|
} else {
|
|
|
|
|
|
createNewFileWithData(logData);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void createNewFileWithData(String &logData) {
|
2022-09-08 00:27:38 +02:00
|
|
|
|
String path = "/lg/" + id + "/" + String(unixTimeShort) + ".txt"; //создадим путь вида /lg/id/133256622333.txt
|
2022-08-30 00:23:06 +02:00
|
|
|
|
addFileLn(path, logData); //запишем файл и данные в него
|
|
|
|
|
|
saveDataDB(id, path); //запишем путь к файлу в базу данных
|
|
|
|
|
|
SerialPrint("i", F("Loging"), "'" + id + "' file created http://" + WiFi.localIP().toString() + path);
|
2022-08-13 12:18:58 +02:00
|
|
|
|
}
|
2022-08-25 00:45:17 +02:00
|
|
|
|
|
2022-08-30 00:23:06 +02:00
|
|
|
|
void addNewDataToExistingFile(String &path, String &logData) {
|
|
|
|
|
|
addFileLn(path, logData);
|
|
|
|
|
|
SerialPrint("i", F("Loging"), "'" + id + "' loging in file http://" + WiFi.localIP().toString() + path);
|
2022-08-25 00:45:17 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-30 00:23:06 +02:00
|
|
|
|
#if defined(ESP8266)
|
2022-09-08 00:27:38 +02:00
|
|
|
|
void getFilesList8266() {
|
|
|
|
|
|
filesList = "";
|
|
|
|
|
|
String directory = "lg/" + id;
|
2022-08-30 00:23:06 +02:00
|
|
|
|
auto dir = FileFS.openDir(directory);
|
2022-08-25 15:46:19 +02:00
|
|
|
|
while (dir.next()) {
|
|
|
|
|
|
String fname = dir.fileName();
|
2022-09-08 00:27:38 +02:00
|
|
|
|
if (fname != "") filesList += directory + "/" + fname + ";";
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-08-30 00:23:06 +02:00
|
|
|
|
#endif
|
2022-09-08 00:27:38 +02:00
|
|
|
|
|
2022-08-30 00:23:06 +02:00
|
|
|
|
#if defined(ESP32)
|
2022-09-08 00:27:38 +02:00
|
|
|
|
void getFilesList32() {
|
|
|
|
|
|
filesList = "";
|
|
|
|
|
|
String directory = "/lg/" + id;
|
|
|
|
|
|
File root = FileFS.open(directory);
|
|
|
|
|
|
directory = String();
|
|
|
|
|
|
if (root.isDirectory()) {
|
|
|
|
|
|
File file = root.openNextFile();
|
|
|
|
|
|
while (file) {
|
|
|
|
|
|
String fname = file.name();
|
|
|
|
|
|
fname = selectToMarkerLast(fname, "/");
|
|
|
|
|
|
file = root.openNextFile();
|
|
|
|
|
|
if (fname != "") filesList += directory + "/" + fname + ";";
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
void getFilesList() {
|
|
|
|
|
|
#if defined(ESP8266)
|
|
|
|
|
|
getFilesList8266();
|
2022-08-30 00:23:06 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(ESP32)
|
2022-09-08 00:27:38 +02:00
|
|
|
|
getFilesList32();
|
2022-08-30 00:23:06 +02:00
|
|
|
|
#endif
|
2022-09-08 00:27:38 +02:00
|
|
|
|
}
|
2022-08-25 15:46:19 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
void sendChart(bool mqtt) {
|
|
|
|
|
|
getFilesList();
|
|
|
|
|
|
int f = 0;
|
2022-08-30 00:23:06 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
while (filesList.length()) {
|
|
|
|
|
|
String buf = selectToMarker(filesList, ";");
|
|
|
|
|
|
|
|
|
|
|
|
f++;
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
createJson(buf, i, mqtt);
|
|
|
|
|
|
unsigned long fileUnixTime = selectToMarkerLast(deleteToMarkerLast(buf, "."), "/").toInt() + START_DATETIME;
|
|
|
|
|
|
SerialPrint("i", F("Loging"), String(f) + ") path: " + buf + ", lines №: " + String(i) + ", creation time: " + getDateTimeDotFormatedFromUnix(fileUnixTime));
|
|
|
|
|
|
|
|
|
|
|
|
filesList = deleteBeforeDelimiter(filesList, ";");
|
2022-08-30 00:23:06 +02:00
|
|
|
|
}
|
2022-09-08 00:27:38 +02:00
|
|
|
|
}
|
2022-08-25 20:23:53 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
void cleanData() {
|
|
|
|
|
|
getFilesList();
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
while (filesList.length()) {
|
|
|
|
|
|
String buf = selectToMarker(filesList, ";");
|
|
|
|
|
|
|
|
|
|
|
|
i++;
|
|
|
|
|
|
removeFile(buf);
|
|
|
|
|
|
SerialPrint("i", "Files", String(i) + ") " + buf + " => deleted");
|
|
|
|
|
|
|
|
|
|
|
|
filesList = deleteBeforeDelimiter(filesList, ";");
|
2022-08-30 00:23:06 +02:00
|
|
|
|
}
|
2022-09-08 00:27:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// void sendChart2(bool mqtt) {
|
|
|
|
|
|
// //отправка графика может происходить только если время синхронизированно
|
|
|
|
|
|
// if (!isTimeSynch) {
|
|
|
|
|
|
// SerialPrint("E", F("Loging"), "'" + id + "' Сant send chart - time not synchronized");
|
|
|
|
|
|
// return;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "'----------------------------");
|
|
|
|
|
|
// String reqUnixTimeStr = "27.08.2022"; //нужно получить эту дату из окна ввода под графиком.
|
|
|
|
|
|
// unsigned long reqUnixTime = strDateToUnix(reqUnixTimeStr);
|
|
|
|
|
|
//
|
|
|
|
|
|
// int i = 0;
|
|
|
|
|
|
//#if defined(ESP8266)
|
|
|
|
|
|
// String directory = "lg";
|
|
|
|
|
|
// auto dir = FileFS.openDir(directory);
|
|
|
|
|
|
// while (dir.next()) {
|
|
|
|
|
|
// String fname = dir.fileName();
|
|
|
|
|
|
//#endif
|
|
|
|
|
|
//#if defined(ESP32)
|
|
|
|
|
|
// String directory = "/lg";
|
|
|
|
|
|
// File root = FileFS.open(directory);
|
|
|
|
|
|
// directory = String();
|
|
|
|
|
|
// if (root.isDirectory()) {
|
|
|
|
|
|
// File file = root.openNextFile();
|
|
|
|
|
|
// while (file) {
|
|
|
|
|
|
// String fname = file.name();
|
|
|
|
|
|
// fname = selectToMarkerLast(fname, "/");
|
|
|
|
|
|
// file = root.openNextFile();
|
|
|
|
|
|
//#endif
|
|
|
|
|
|
// String idInFileName = selectToMarker(fname, "-");
|
|
|
|
|
|
// unsigned long fileUnixTime = deleteBeforeDelimiter(deleteToMarkerLast(fname, "."), "-").toInt() + START_DATETIME;
|
|
|
|
|
|
// if (isItemExist(id)) {
|
|
|
|
|
|
// //если id в имени файла совпадает с id данного экземпляра, пусть каждый экземпляр класса шлет только свое
|
|
|
|
|
|
// if (idInFileName == id) {
|
|
|
|
|
|
// //выбираем только те файлы которые входят в выбранные пользователем сутки
|
|
|
|
|
|
// // if (fileUnixTime > reqUnixTime && fileUnixTime < reqUnixTime + 86400) {
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "' matching file found '" + fname + "'");
|
|
|
|
|
|
// //выгрузка по частям, по одному файлу
|
|
|
|
|
|
// createJson("/lg/" + fname, i, mqtt);
|
|
|
|
|
|
// //}
|
|
|
|
|
|
// //удаление старых файлов
|
|
|
|
|
|
// if ((fileUnixTime + (points * interval)) < (unixTime - (keepdays * 86400))) {
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "' file '" + fname + "' too old, deleted");
|
|
|
|
|
|
// removeFile(directory + "/" + fname);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "' file '" + fname + "' not used, deleted");
|
|
|
|
|
|
// removeFile(directory + "/" + fname);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
//#if defined(ESP32)
|
|
|
|
|
|
// }
|
|
|
|
|
|
//#endif
|
|
|
|
|
|
//
|
|
|
|
|
|
// SerialPrint("i", F("Loging"), "'" + id + "'--------------'" + String(i) + "'--------------");
|
|
|
|
|
|
// }
|
2022-08-25 19:24:56 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
void createJson(String file, int &i, bool mqtt) {
|
|
|
|
|
|
File configFile = FileFS.open(file, "r");
|
|
|
|
|
|
if (!configFile) {
|
|
|
|
|
|
SerialPrint("E", F("Loging"), "'" + id + "' open file error");
|
|
|
|
|
|
return;
|
2022-08-30 00:23:06 +02:00
|
|
|
|
}
|
2022-09-08 00:27:38 +02:00
|
|
|
|
configFile.seek(0, SeekSet);
|
|
|
|
|
|
String buf = "{}";
|
|
|
|
|
|
String oneSingleJson;
|
|
|
|
|
|
String unix_time;
|
|
|
|
|
|
String value;
|
|
|
|
|
|
unsigned int psn;
|
|
|
|
|
|
unsigned int sz = configFile.size();
|
|
|
|
|
|
do {
|
|
|
|
|
|
i++;
|
|
|
|
|
|
psn = configFile.position();
|
|
|
|
|
|
String line = configFile.readStringUntil('\n');
|
|
|
|
|
|
unix_time = selectToMarker(line, " ");
|
|
|
|
|
|
jsonWriteInt(buf, "x", unix_time.toInt() + START_DATETIME);
|
|
|
|
|
|
value = deleteBeforeDelimiter(line, " ");
|
|
|
|
|
|
jsonWriteFloat(buf, "y1", value.toFloat());
|
|
|
|
|
|
if (unix_time != "" || value != "") {
|
|
|
|
|
|
oneSingleJson += buf + ",";
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (psn < sz);
|
|
|
|
|
|
|
|
|
|
|
|
configFile.close();
|
|
|
|
|
|
|
|
|
|
|
|
String topic = mqttRootDevice + "/" + id;
|
|
|
|
|
|
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
|
|
|
|
|
|
oneSingleJson.replace("},]}", "}]}");
|
2022-08-13 12:18:58 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
publishJson(oneSingleJson, mqtt);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void publishJson(String &oneSingleJson, bool mqtt) {
|
|
|
|
|
|
if (mqtt) {
|
|
|
|
|
|
publishChart(id, oneSingleJson);
|
2022-08-30 00:23:06 +02:00
|
|
|
|
} else {
|
2022-09-08 00:27:38 +02:00
|
|
|
|
publishStatusWsJson(oneSingleJson);
|
2022-08-30 00:23:06 +02:00
|
|
|
|
}
|
2022-08-13 12:18:58 +02:00
|
|
|
|
}
|
2022-08-30 00:23:06 +02:00
|
|
|
|
|
2022-09-08 00:27:38 +02:00
|
|
|
|
//примерный подсчет максимального количества точек
|
|
|
|
|
|
int calculateMaxCount() {
|
|
|
|
|
|
return 86400 / interval;
|
|
|
|
|
|
}
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
void *getAPI_Loging(String subtype, String param) {
|
|
|
|
|
|
if (subtype == F("Loging")) {
|
|
|
|
|
|
return new Loging(param);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
return nullptr;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//то что не пригодилось но пригодится потом может быть
|
|
|
|
|
|
// void createOneSingleJson(String &oneSingleJson, String file, int &maxCount, int &i) {
|
|
|
|
|
|
// File configFile = FileFS.open(file, "r");
|
|
|
|
|
|
// if (!configFile) {
|
|
|
|
|
|
// return;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// configFile.seek(0, SeekSet);
|
|
|
|
|
|
// String buf = "{}";
|
|
|
|
|
|
// String unix_time;
|
|
|
|
|
|
// String value;
|
|
|
|
|
|
// unsigned int psn;
|
|
|
|
|
|
// unsigned int sz = configFile.size();
|
|
|
|
|
|
// do {
|
|
|
|
|
|
// maxCount++;
|
|
|
|
|
|
// i++;
|
|
|
|
|
|
// psn = configFile.position();
|
|
|
|
|
|
// String line = configFile.readStringUntil('\n');
|
|
|
|
|
|
// unix_time = selectToMarker(line, " ");
|
|
|
|
|
|
// jsonWriteInt(buf, "x", unix_time.toInt() + START_DATETIME);
|
|
|
|
|
|
// value = deleteBeforeDelimiter(line, " ");
|
|
|
|
|
|
// jsonWriteFloat(buf, "y1", value.toFloat());
|
|
|
|
|
|
// if (unix_time != "" || value != "") {
|
|
|
|
|
|
// oneSingleJson += buf + ",";
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// } while (psn < sz);
|
|
|
|
|
|
//
|
|
|
|
|
|
// configFile.close();
|
|
|
|
|
|
// }
|