From 4d4d304bf17a790538671efbc9d9702eabb208fa Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Fri, 10 Feb 2017 23:35:29 +0800
Subject: [PATCH] 把默认的警报设置变成都变成空
---
method.js | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/method.js b/method.js
index 1480ee3..88d31a1 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();
@@ -359,13 +352,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