From 7922a931d41978a602068a9521fe0cff619fd0a8 Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Wed, 15 Feb 2017 09:52:31 +0800
Subject: [PATCH] 增加mcu温度到调试服务MQ中
---
method.js | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/method.js b/method.js
index 1480ee3..b954412 100644
--- a/method.js
+++ b/method.js
@@ -172,18 +172,11 @@
var mcu = this.toDec(fields[64]) + this.toDec(fields[65]) / 100;
var _config = global.configs[mac];
-
- console.log("----------------------1")
- console.log(_config)
-
if(_config == null) {
_config = config.ALARM_DEFAULTS;
_config.mac = mac;
global.configs[mac] = _config;
}
-
- console.log("----------------------2")
- console.log(_config)
var current = moment();
@@ -197,7 +190,9 @@
x3: x9, //������
x4: x11, //������
x5: x10, //������
- x6: x14 //������������
+ x6: x14, //������������
+
+ mcu: mcu
},
options: _config.options,
time: current.valueOf()
@@ -359,13 +354,16 @@
};
module.exports.initConfigs = function(db) {
+ var _address = config.ALARM_DEFAULTS.address;
+ var _location = config.ALARM_DEFAULTS.location;
+ var _options = config.ALARM_DEFAULTS.options;
db.collection("devices").find().toArray(function(err, docs) {
docs.forEach(function(doc) {
var mac = doc.mac;
- var address = doc.address || "";
- var location = doc.location || {};
+ var address = doc.address || _address;
+ var location = doc.location || _location;
+ var options = doc.options || _options;
var notice = doc.notice;
- var options = doc.options;
var config = {
mac: mac,
address: address,
--
Gitblit v1.8.0