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

графики с выбором даты

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-09-11 01:30:22 +02:00
parent 8340ae2a0f
commit 039a36a59d
14 changed files with 102 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data_svelte/build/bundle.css
View File

File diff suppressed because one or more lines are too long

2
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

2
data_svelte/index.html
View File

@@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.2.3</title>
<title>IoT Manager 4.2.5</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css" />

2
data_svelte/items.json
View File

@@ -11,7 +11,7 @@
"type": "Writing",
"subtype": "Loging",
"id": "log",
"widget": "chart1",
"widget": "chart2",
"page": "Графики",
"descr": "Температура",
"int": 1,

2
data_svelte/settings.json
View File

@@ -5,7 +5,7 @@
"appass": "",
"routerssid": "rise2",
"routerpass": "hostel3333",
"timezone": 1,
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",
"webpass": "admin",

2
include/Const.h
View File

@@ -1,7 +1,7 @@
#pragma once
//Версия прошивки
#define FIRMWARE_VERSION 417
#define FIRMWARE_VERSION 418
#ifdef esp8266_4mb
#define FIRMWARE_NAME "esp8266_4mb"

2
include/NTP.h
View File

@@ -11,5 +11,7 @@ extern void synchTime();
extern const String getTimeLocal_hhmm();
extern const String getTimeLocal_hhmmss();
extern const String getDateTimeDotFormated();
extern const String getDateDotFormated();
extern unsigned long strDateToUnix(String date);
const String getDateTimeDotFormatedFromUnix(unsigned long unixTime);
extern unsigned long gmtTimeToLocal(unsigned long gmtTimestamp);

2
include/classes/IoTItem.h
View File

@@ -24,7 +24,7 @@ class IoTItem {
virtual void regEvent(float value, String consoleInfo);
String getSubtype();
virtual void sendChart(bool mqtt);
virtual void sendChart(int type);
virtual void cleanData();
String getID();

2
myProfile.json
View File

@@ -6,7 +6,7 @@
"appass": "",
"routerssid": "rise2",
"routerpass": "hostel3333",
"timezone": 1,
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",
"webpass": "admin",

2
src/MqttClient.cpp
View File

@@ -137,7 +137,7 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
//отправка данных графиков
for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() == "Loging") {
(*it)->sendChart(true);
(*it)->sendChart(1);
}
}

11
src/NTP.cpp
View File

@@ -39,6 +39,10 @@ void synchTime() {
configTime(0, 0, "pool.ntp.org", "ru.pool.ntp.org", "pool.ntp.org");
}
unsigned long gmtTimeToLocal(unsigned long gmtTimestamp) {
return gmtTimestamp + (jsonReadInt(settingsFlashJson, F("timezone")) * 60 * 60);
}
time_t getSystemTime() {
timeval tv{0, 0};
timezone tz = timezone{0, 0};
@@ -117,6 +121,13 @@ const String getDateTimeDotFormated() {
return String(buf);
}
const String getDateDotFormated() {
char buf[32];
sprintf(buf, "%02d.%02d.%d", _time_local.day_of_month, _time_local.month, _time_local.year + 2000);
return String(buf);
}
// format 22.02.2022
unsigned long strDateToUnix(String date) {
int day = selectToMarker(date, ".").toInt();
date = deleteBeforeDelimiter(date, ".");

2
src/WsServer.cpp
View File

@@ -62,7 +62,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
//отправка данных графиков
for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() == "Loging") {
(*it)->sendChart(false);
(*it)->sendChart(2);
}
}
}

2
src/classes/IoTItem.cpp
View File

@@ -128,7 +128,7 @@ String IoTItem::getSubtype() {
return _subtype;
}
void IoTItem::sendChart(bool mqtt) {}
void IoTItem::sendChart(int type) {}
void IoTItem::cleanData() {}

186
src/modules/virtual/Logging/Loging.cpp
View File

@@ -12,8 +12,6 @@ class Loging : public IoTItem {
String id;
String filesList = "";
bool firstTime = true;
int points;
int keepdays;
@@ -35,43 +33,11 @@ class Loging : public IoTItem {
jsonRead(parameters, F("keepdays"), keepdays);
//создадим экземпляр класса даты
dateIoTItem = (IoTItem *)getAPI_Date("{\"id\": \"" + id + "-date\"}");
dateIoTItem = (IoTItem *)getAPI_Date("{\"id\": \"" + id + "-date\",\"int\":\"20\"}");
IoTItems.push_back(dateIoTItem);
}
String getValue() {
return "";
}
void loop() {
if (enableDoByInt) {
currentMillis = millis();
difference = currentMillis - prevMillis;
if (difference >= interval) {
prevMillis = millis();
this->doByInterval();
}
}
}
void regEvent(String value, String consoleInfo = "") {
generateEvent(_id, value);
publishStatusMqtt(_id, value);
String json = createSingleJson(_id, value);
publishStatusWsJson(json);
SerialPrint("i", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'");
}
String createSingleJson(String id, String value) {
String topic = mqttRootDevice + "/" + _id;
return "{\"topic\":\"" + topic + "\",\"status\":[{\"x\":" + String(unixTime) + ",\"y1\":" + value + "}]}";
}
void doByInterval() {
if (firstTime) {
firstTime = false;
}
//если объект логгирования не был создан
if (!isItemExist(logid)) {
SerialPrint("E", F("Loging"), "'" + id + "' loging object not exist");
@@ -171,35 +137,44 @@ class Loging : public IoTItem {
#endif
}
void sendChart(bool mqtt) {
void sendChart(int type) {
getFilesList();
int f = 0;
bool noData = true;
while (filesList.length()) {
String buf = selectToMarker(filesList, ";");
f++;
int i = 0;
unsigned long fileUnixTime = selectToMarkerLast(deleteToMarkerLast(buf, "."), "/").toInt() + START_DATETIME;
unsigned long fileUnixTimeGMT = selectToMarkerLast(deleteToMarkerLast(buf, "."), "/").toInt() + START_DATETIME;
unsigned long fileUnixTimeLocal = gmtTimeToLocal(fileUnixTimeGMT);
//удаление старых файлов
if ((fileUnixTime + (points * (interval / 1000))) < (unixTime - (keepdays * 86400))) {
SerialPrint("i", F("Loging"), "file '" + buf + "' too old, deleted");
removeFile(buf);
} else {
// if ((fileUnixTimeLocal + (points * (interval / 1000))) < (unixTime - (keepdays * 86400))) {
// SerialPrint("i", F("Loging"), "file '" + buf + "' too old, deleted");
// removeFile(buf);
//} else {
unsigned long reqUnixTime = strDateToUnix(date);
if (fileUnixTime > reqUnixTime && fileUnixTime < reqUnixTime + 86400) {
createJson(buf, i, mqtt);
SerialPrint("i", F("Loging"), "file '" + buf + "' sent, user requested " + date);
if (fileUnixTimeLocal > reqUnixTime && fileUnixTimeLocal < reqUnixTime + 86400) {
noData = false;
createJson(buf, i, type);
SerialPrint("i", F("Loging"), String(f) + ")" + buf + ", " + String(i) + ", " + getDateTimeDotFormatedFromUnix(fileUnixTimeLocal) + ", sent");
} else {
SerialPrint("i", F("Loging"), "file '" + buf + "' skipped, user requested " + date);
}
SerialPrint("i", F("Loging"), String(f) + ")" + buf + ", " + String(i) + ", " + getDateTimeDotFormatedFromUnix(fileUnixTimeLocal) + ", skipped");
}
//}
SerialPrint("i", F("Loging"), String(f) + ") path: " + buf + ", lines №: " + String(i) + ", created: " + getDateTimeDotFormatedFromUnix(fileUnixTime));
filesList = deleteBeforeDelimiter(filesList, ";");
}
//если данных нет отправляем пустой грфик
if (noData) {
SerialPrint("i", F("Loging"), "clear chart");
String cleanJson = createEmtyJson();
publishJson(cleanJson, type);
}
}
void cleanData() {
@@ -216,64 +191,7 @@ class Loging : public IoTItem {
}
}
// 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) + "'--------------");
// }
void createJson(String file, int &i, bool mqtt) {
void createJson(String file, int &i, int type) {
File configFile = FileFS.open(file, "r");
if (!configFile) {
SerialPrint("E", F("Loging"), "'" + id + "' open file error");
@@ -305,17 +223,53 @@ class Loging : public IoTItem {
oneSingleJson = "{\"maxCount\":" + String(calculateMaxCount()) + ",\"topic\":\"" + topic + "\",\"status\":[" + oneSingleJson + "]}";
oneSingleJson.replace("},]}", "}]}");
publishJson(oneSingleJson, mqtt);
publishJson(oneSingleJson, type);
}
void publishJson(String &oneSingleJson, bool mqtt) {
if (mqtt) {
void publishJson(String &oneSingleJson, int type) {
if (type == 1) {
publishChart(id, oneSingleJson);
} else if (type == 2) {
publishStatusWsJson(oneSingleJson);
} else if (type == 3) {
publishChart(id, oneSingleJson);
} else {
publishStatusWsJson(oneSingleJson);
}
}
String getValue() {
return "";
}
void loop() {
if (enableDoByInt) {
currentMillis = millis();
difference = currentMillis - prevMillis;
if (difference >= interval) {
prevMillis = millis();
this->doByInterval();
}
}
}
void regEvent(String value, String consoleInfo = "") {
generateEvent(_id, value);
publishStatusMqtt(_id, value);
String json = createSingleJson(_id, value);
publishStatusWsJson(json);
SerialPrint("i", "Sensor " + consoleInfo, "'" + _id + "' data: " + value + "'");
}
String createSingleJson(String id, String value) {
String topic = mqttRootDevice + "/" + _id;
return "{\"topic\":\"" + topic + "\",\"status\":[{\"x\":" + String(unixTime) + ",\"y1\":" + value + "}]}";
}
String createEmtyJson() {
String topic = mqttRootDevice + "/" + _id;
return "{\"topic\":\"" + topic + "\",\"status\":[],\"maxCount\":\"0\"}";
}
//просто максимальное количество точек
int calculateMaxCount() {
return 86400;
@@ -332,6 +286,8 @@ void *getAPI_Loging(String subtype, String param) {
class Date : public IoTItem {
private:
bool firstTime = true;
public:
String id;
Date(String parameters) : IoTItem(parameters) {
@@ -350,12 +306,20 @@ class Date : public IoTItem {
regEvent(value.valS, "");
for (std::list<IoTItem *>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
if ((*it)->getSubtype() == "Loging") {
(*it)->sendChart(true);
(*it)->sendChart(3);
}
}
}
void doByInterval() {}
void doByInterval() {
if (isTimeSynch) {
if (firstTime) {
setValue(getDateDotFormated());
SerialPrint("E", F("Loging"), "today date set " + getDateDotFormated());
firstTime = false;
}
}
}
};
void *getAPI_Date(String param) {