Merge branch 'develop' into sherzog_dev

This commit is contained in:
Sebastian 2020-07-15 10:36:37 +02:00
commit bb58f91a47

View File

@ -28,21 +28,10 @@ function messageCallback(collection) {
const id = topicElements.pop();
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 = {
device_id: id,
timestamp: time,
timestamp: date,
}
try {
doc = _.merge(doc, JSON.parse(message));