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
|
|
|
|
|
2022-08-25 20:23:53 +02:00
|
|
|
|
//раскомментировать если нужна цельная выгрузка графиков
|
2022-08-26 00:01:01 +02:00
|
|
|
|
#define SOLID_UPLOADING
|
2022-08-25 19:24:56 +02:00
|
|
|
|
|
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-08-25 15:15:06 +02:00
|
|
|
|
int points;
|
2022-08-25 00:45:17 +02:00
|
|
|
|
String fileName = "";
|
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-25 20:23:53 +02:00
|
|
|
|
jsonRead(parameters, F("int"), interval);
|
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-25 23:16:49 +02:00
|
|
|
|
if (!isItemExist(logid)) {
|
|
|
|
|
|
SerialPrint("E", "Loging " + id, F("logging value not exist"));
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
String value = getItemValue(logid);
|
2022-08-25 20:23:53 +02:00
|
|
|
|
int lines = 0;
|
2022-08-25 00:45:17 +02:00
|
|
|
|
//если задано не правильное logid величины для логгирования
|
2022-08-13 12:18:58 +02:00
|
|
|
|
if (value == "") {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("E", "Loging " + id, F("logging value empty"));
|
|
|
|
|
|
return;
|
2022-08-13 12:18:58 +02:00
|
|
|
|
} else {
|
2022-08-25 00:45:17 +02:00
|
|
|
|
//если время было получено из интернета
|
2022-08-24 00:59:44 +02:00
|
|
|
|
if (isTimeSynch) {
|
2022-08-25 15:15:06 +02:00
|
|
|
|
// regEvent(value, "Loging");
|
2022-08-25 00:45:17 +02:00
|
|
|
|
String logData = String(unixTimeShort) + " " + value;
|
|
|
|
|
|
//если зашли сюда первый раз то создаем файл с именем id-timestamp
|
|
|
|
|
|
if (firstTime) {
|
|
|
|
|
|
firstTime = false;
|
|
|
|
|
|
createFileWithIdDatatimeName(logData);
|
|
|
|
|
|
//если 2 ой раз и последующие разы
|
|
|
|
|
|
} else {
|
|
|
|
|
|
lines = countLines(fileName);
|
2022-08-25 20:23:53 +02:00
|
|
|
|
if (lines <= points) {
|
2022-08-25 00:45:17 +02:00
|
|
|
|
addFileLn(fileName, logData);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
createFileWithIdDatatimeName(logData);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("i", "Loging " + id, "loging in file (" + String(lines) + ") http://" + WiFi.localIP().toString() + fileName);
|
2022-08-25 00:45:17 +02:00
|
|
|
|
|
2022-08-24 00:59:44 +02:00
|
|
|
|
} else {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("E", "Loging " + id, F("Сant loging - time not synchronized"));
|
2022-08-24 00:59:44 +02:00
|
|
|
|
}
|
2022-08-13 12:18:58 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-08-25 00:45:17 +02:00
|
|
|
|
|
|
|
|
|
|
void createFileWithIdDatatimeName(String &logData) {
|
|
|
|
|
|
fileName = "/logs/" + id + "-" + String(unixTimeShort) + ".txt";
|
|
|
|
|
|
addFileLn(fileName, logData);
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("i", "Loging " + id, "file created http://" + WiFi.localIP().toString() + fileName);
|
2022-08-25 00:45:17 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-25 15:46:19 +02:00
|
|
|
|
void sendChart() {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("I", "Loging " + id, "----------------------------");
|
2022-08-25 15:46:19 +02:00
|
|
|
|
String reqUnixTimeStr = "25.08.2022"; //нужно получить эту дату из окна ввода под графиком.
|
|
|
|
|
|
unsigned long reqUnixTime = strDateToUnix(reqUnixTimeStr);
|
|
|
|
|
|
|
|
|
|
|
|
String directory = "logs";
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("I", "Loging " + id, "in directory '" + directory + "' files:");
|
2022-08-25 15:46:19 +02:00
|
|
|
|
auto dir = FileFS.openDir(directory);
|
2022-08-25 19:24:56 +02:00
|
|
|
|
String oneSingleJson;
|
|
|
|
|
|
int maxCount = 0;
|
2022-08-25 20:33:25 +02:00
|
|
|
|
int i = 0;
|
2022-08-25 15:46:19 +02:00
|
|
|
|
|
|
|
|
|
|
while (dir.next()) {
|
|
|
|
|
|
String fname = dir.fileName();
|
2022-08-25 23:16:49 +02:00
|
|
|
|
String idInFileName = selectToMarker(fname, "-");
|
2022-08-25 15:46:19 +02:00
|
|
|
|
unsigned long fileUnixTime = deleteBeforeDelimiter(deleteToMarkerLast(fname, "."), "-").toInt() + START_DATETIME;
|
|
|
|
|
|
if (isItemExist(id)) {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
//если id в имени файла совпадает с id данного экземпляра, пусть каждый экземпляр класса шлет только свое
|
|
|
|
|
|
if (idInFileName == id) {
|
|
|
|
|
|
//выбираем только те файлы которые входят в выбранные пользователем сутки
|
|
|
|
|
|
if (fileUnixTime > reqUnixTime && fileUnixTime < reqUnixTime + 86400) {
|
|
|
|
|
|
SerialPrint("I", "Loging " + id, "matching file found '" + fname + "'");
|
2022-08-25 19:24:56 +02:00
|
|
|
|
#ifdef SOLID_UPLOADING
|
2022-08-25 23:16:49 +02:00
|
|
|
|
//если активированна выгрузка целеком
|
|
|
|
|
|
createOneSingleJson(oneSingleJson, "/logs/" + fname, maxCount, i);
|
2022-08-25 19:24:56 +02:00
|
|
|
|
#else
|
2022-08-25 23:16:49 +02:00
|
|
|
|
//выгрузка по частям, по одному файлу
|
|
|
|
|
|
publishJsonPartly("/logs/" + fname, calculateMaxCount(), i);
|
2022-08-25 19:24:56 +02:00
|
|
|
|
#endif
|
2022-08-25 23:16:49 +02:00
|
|
|
|
}
|
2022-08-25 15:46:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
} else {
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("i", "Loging " + id, "file '" + fname + "' not used, deleted");
|
2022-08-25 15:46:19 +02:00
|
|
|
|
removeFile(directory + "/" + fname);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-08-25 19:24:56 +02:00
|
|
|
|
#ifdef SOLID_UPLOADING
|
2022-08-25 20:23:53 +02:00
|
|
|
|
publishJson(oneSingleJson, maxCount);
|
2022-08-25 19:24:56 +02:00
|
|
|
|
#endif
|
2022-08-25 23:16:49 +02:00
|
|
|
|
SerialPrint("I", "Loging " + id, "--------------'" + String(i) + "'--------------");
|
2022-08-25 15:46:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-25 20:23:53 +02:00
|
|
|
|
void createOneSingleJson(String &oneSingleJson, String file, int &maxCount, int &i) {
|
2022-08-25 15:46:19 +02:00
|
|
|
|
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 {
|
2022-08-25 19:24:56 +02:00
|
|
|
|
maxCount++;
|
2022-08-25 20:23:53 +02:00
|
|
|
|
i++;
|
2022-08-25 15:46:19 +02:00
|
|
|
|
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 != "") {
|
2022-08-25 19:24:56 +02:00
|
|
|
|
oneSingleJson += buf + ",";
|
2022-08-25 15:46:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} while (psn < sz);
|
|
|
|
|
|
|
|
|
|
|
|
configFile.close();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-25 20:23:53 +02:00
|
|
|
|
void publishJsonPartly(String file, int maxCount, int &i) {
|
|
|
|
|
|
File configFile = FileFS.open(file, "r");
|
|
|
|
|
|
if (!configFile) {
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
configFile.seek(0, SeekSet);
|
|
|
|
|
|
String buf = "{}";
|
|
|
|
|
|
String dividedJson;
|
|
|
|
|
|
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 != "") {
|
|
|
|
|
|
dividedJson += buf + ",";
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (psn < sz);
|
|
|
|
|
|
|
|
|
|
|
|
configFile.close();
|
|
|
|
|
|
|
|
|
|
|
|
publishJson(dividedJson, maxCount);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void publishJson(String &oneSingleJson, int &maxCount) {
|
2022-08-25 19:24:56 +02:00
|
|
|
|
oneSingleJson = "{\"maxCount\":" + String(maxCount) + ",\"status\":[" + oneSingleJson + "]}";
|
|
|
|
|
|
oneSingleJson.replace("},]}", "}]}");
|
2022-08-25 23:16:49 +02:00
|
|
|
|
// SerialPrint("i", "Loging " + id, "publish chart, maxCount: '" + String(maxCount) + "'");
|
2022-08-25 19:24:56 +02:00
|
|
|
|
publishChart(id, oneSingleJson);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-08-25 20:23:53 +02:00
|
|
|
|
int calculateMaxCount() {
|
|
|
|
|
|
return 86400 / interval;
|
|
|
|
|
|
}
|
2022-08-13 12:18:58 +02:00
|
|
|
|
};
|
|
|
|
|
|
|
2022-08-25 00:45:17 +02:00
|
|
|
|
void *getAPI_Loging(String subtype, String param) {
|
2022-08-13 12:18:58 +02:00
|
|
|
|
if (subtype == F("Loging")) {
|
|
|
|
|
|
return new Loging(param);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
return nullptr;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|