Merge branch 'develop' into sherzog_dev
This commit is contained in:
commit
bb58f91a47
@ -28,21 +28,10 @@ function messageCallback(collection) {
|
|||||||
const id = topicElements.pop();
|
const id = topicElements.pop();
|
||||||
|
|
||||||
var date = new Date;
|
var date = new Date;
|
||||||
var time;
|
|
||||||
|
|
||||||
if (date.getHours() <= 9) {time = "0" + date.getHours();} else {
|
|
||||||
time = date.getHours();
|
|
||||||
}
|
|
||||||
if (date.getMinutes() <= 9) {time = time + ":0" + date.getMinutes();} else {
|
|
||||||
time = time + ":" + date.getMinutes();
|
|
||||||
}
|
|
||||||
if (date.getSeconds() <= 9) {time = time + ":0" + date.getSeconds();} else {
|
|
||||||
time = time + ":" + date.getSeconds();
|
|
||||||
}
|
|
||||||
|
|
||||||
let doc = {
|
let doc = {
|
||||||
device_id: id,
|
device_id: id,
|
||||||
timestamp: time,
|
timestamp: date,
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
doc = _.merge(doc, JSON.parse(message));
|
doc = _.merge(doc, JSON.parse(message));
|
||||||
@ -63,4 +52,4 @@ function onMqttConnect(mqttClient) {
|
|||||||
console.log("Sucessfully subscribed...");
|
console.log("Sucessfully subscribed...");
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user