oms-is-citysys/citysys-flowserver
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version 2025-01-30; send fw version once a day

Browse source
This commit is contained in:
rasta5man 2025-02-04 18:45:06 +01:00
parent 73a2620add
commit 5233aa38af
3 changed files with 141 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

49
flow/helper/DataToTbHandler.js
View file

@ -5,11 +5,10 @@ class DataToTbHandler {
// time, after new value for the given key will be resend to tb (e.g. {status: "OK"})
this.timeToHoldTbValue = 30 * 60; //30 minutes
this.previousValues = {};
this.debug = false;
this.messageCounter = 0;
this.itIsNodeReadout = false;
this.sender = "";
// if attribute change difference is less than limit value, we do not send to tb.
@ -25,11 +24,12 @@ class DataToTbHandler {
Phase_2_power: 2,
Phase_3_power: 2,
total_power: 2,
total_energy: 1,
Phase_1_pow_factor: 0.1,
Phase_2_pow_factor: 0.1,
Phase_3_pow_factor: 0.1,
power_factor: 0.1,
lifetime: 0.5,
lifetime: 2,
voltage: 2,
power: 2,
frequency: 3,
@ -59,28 +59,34 @@ class DataToTbHandler {
return true;
}
sendToTb(dataToTb, instance) {
let keys = Object.keys(dataToTb);
sendToTb(data, instance) {
//not to modify data object, we do deep copy:
let dataCopy = JSON.parse(JSON.stringify(data));
let keys = Object.keys(dataCopy);
if (keys.length == 0) {
if (this.debug) console.log("sendToTb received empty object", dataToTb);
if (this.debug) console.log("sendToTb received empty object", dataCopy);
return;
}
let tbname = keys[0];
let ts;
let arrayOfValues = dataToTb[tbname];
let arrayOfValues = dataCopy[tbname];
let arrayOfValuesToSend = [];
for (let i = 0; i < arrayOfValues.length; i++) {
ts = arrayOfValues[i].ts;
let values = this.prepareValuesForTb(tbname, ts, arrayOfValues[i].values);
if (!this.isEmptyObject(values)) {
arrayOfValuesToSend.push({ ts: ts, values: values });
}
}
if (arrayOfValuesToSend.length == 0) {
@ -99,15 +105,20 @@ class DataToTbHandler {
instance.send(this.index, dataToTbModified);
}
getDiffTimestamp(key) {
//TODO set different value for given key!!!
//if(key == "status") this.timeToHoldTbValue = 2*60*60;//2h
return this.timeToHoldTbValue * 1000;
}
prepareValuesForTb(tbname, timestamp, values) {
let keys = Object.keys(values);
if (keys.includes("lifetime")) this.itIsNodeReadout = true;
if (!this.previousValues.hasOwnProperty(tbname)) {
this.previousValues[tbname] = {};
}
@ -115,6 +126,7 @@ class DataToTbHandler {
//if(this.debug) console.log("prepareValuesForTb", tbname, timestamp, values);
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
let value = values[key];
@ -123,15 +135,34 @@ class DataToTbHandler {
continue;
}
// attributeData ==> voltage: {ts:333333, value:5}
// attributeData ==> {voltage: {ts:333333, value:5}}
let attributeData = this.previousValues[tbname][key];
let attributeToChange = false;
if (key in this.attributeChangeLimit) attributeToChange = true;
let limit = this.attributeChangeLimit[key];
let timestampDiffToRemoveKey;
//this will ensure "node statecode" will be sent just once an hour
if (this.itIsNodeReadout && key === "statecode") {
attributeData.value = value;
this.itIsNodeReadout = false;
timestampDiffToRemoveKey = 1 * 60 * 60 * 1000; // 1 hour
}
if (key === "twilight_sensor" && value > 100) {
attributeData.value = value;
}
//if edge, master or node version do not change, send just once a day:
if (["edge_fw_version", "master_node_version", "fw_version"].includes(key)) {
timestampDiffToRemoveKey = 24 * 60 * 60 * 1000;
}
if (attributeData.value === value || attributeToChange && Math.abs(attributeData.value - value) < limit) {
let diff = timestamp - attributeData.ts;
let timestampDiffToRemoveKey = this.getDiffTimestamp(key);
if (!timestampDiffToRemoveKey) timestampDiffToRemoveKey = this.getDiffTimestamp(key);
if (diff > timestampDiffToRemoveKey) {
attributeData.ts = Date.now();
//if(this.debug) console.log(this.sender + ": update ts for key", key, "diff is", diff, "messageCounter", this.messageCounter);