From 2c36fa5b1a9ebda1bfc049e71e376ee37916507a Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 20 Jan 2017 23:32:57 +0800
Subject: [PATCH] 错误修正 - 数组为null时直接返回level=0
---
method.js | 110 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 44 deletions(-)
diff --git a/method.js b/method.js
index 2eb056f..7e89d44 100644
--- a/method.js
+++ b/method.js
@@ -131,6 +131,10 @@
mac = mac.toLowerCase();
this.updateDeviceLastUpdated(db, mac, function(data) {});
+ //������������������������������������������������������
+ //var ver = this.toDec(fields[18]) * 256 + this.toDec(fields[19]); //���������
+
+
var x1 = this.toDec(fields[20]) * 256 + this.toDec(fields[21]); //PM2.5������
var x2 = this.toDec(fields[22]) * 256 + this.toDec(fields[23]); //PM10
var x3 = this.toDec(fields[24]) * 256 + this.toDec(fields[25]); //0.1���0.3um���
@@ -172,14 +176,21 @@
_config = {
mac: mac,
address: "���������������������������������",
- location: {���
+ location: {
lat:31.430616,
- lng:120.988327���
+ lng:120.988327
},
notice: {
- tel: "15950198162",���
- email: "it01@moral.org.cn",���
+ tel: "15950198162",
+ email: "it01@moral.org.cn",
open_id: "o-RTuwvMHWotyirPHLmdSB_dKoQU"
+ },
+ options: {
+ 1: [1000, 2000, 3000],
+ 2: [1000, 2000, 3000],
+ 3: [1000, 2000, 3000],
+ 4: [1000, 2000, 3000],
+ 5: [1000, 2000, 3000]
}
};
configs[mac] = _config;
@@ -199,6 +210,7 @@
x5: x10, //������
x6: x14 //������������
},
+ options: _config.options,
time: current.valueOf()
};
queue.pushToMQ('ex_data_screen', sensor_data);
@@ -221,6 +233,7 @@
}, function(err, result) { });
}
+ var _this = this;
db.collection("data").insertOne({
mac: mac,
x1: x1,
@@ -253,22 +266,34 @@
}, function(err, doc) {
if (err) return;
- if(x1 > 250) {
- var level = 1;
- if(x1 > 750) {
- level = 3;
- } else if(x1 > 500) {
- level = 2;
- }
- sensor_data._id = doc.insertedId;
- sensor_data.level = level;
- sensor_data.notice = _config.notice;
- sensor_data.address = _config.address;
- queue.pushToMQ('ex_data_alarm', sensor_data);
- }
+ var level1 = _this.getLevel(x1, _config['options'][1]);
+ var level2 = _this.getLevel(x9, _config['options'][2]);
+ var level3 = _this.getLevel(x11, _config['options'][3]);
+ var level4 = _this.getLevel(x10, _config['options'][4]);
+ var level5 = _this.getLevel(x14, _config['options'][5]);
+ sensor_data._id = doc.insertedId;
+ sensor_data.level = Math.max(level1, level2, level3, level4, level5);
+ sensor_data.notice = _config.notice;
+ sensor_data.address = _config.address;
+ sensor_data.data = { 1: [x1, level1], 2: [x9, level2], 3: [x11, level3], 4: [x10, level4], 5: [x14, level5] };
+ queue.pushToMQ('ex_data_alarm', sensor_data);
callback(doc, rank);
});
+};
+
+module.exports.getLevel = function(val, option) {
+ var level = 0;
+ if(option == null || option.length < 3) return level;
+ if(val > option[0]) {
+ var level = 1;
+ if(val > option[2]) {
+ level = 3;
+ } else if(val > option[1]) {
+ level = 2;
+ }
+ }
+ return level;
};
module.exports.updateDeviceSleep = function(db, data, callback) {
@@ -345,34 +370,31 @@
db.collection("devices").find().toArray(function(err, docs) {
docs.forEach(function(doc) {
var mac = doc.mac;
- if(mac != null) {
- var address = doc.address || "";
- var location = doc.location || {};
- var notice = doc.notice;
- if(notice == null || notice == {}) {
- var userID = doc.userID;
- db.collection("users").find({"_id": userID}).limit(1).next(function(err, user){
- if(user) {
- global.configs[mac] = {
- mac: mac,
- address: address,
- location: location,
- notice: {
- tel: user.username,
- email: user.email,
- open_id: user.open_id
- }
- }
- }
- });
- } else {
- global.configs[mac] = {
- mac: mac,
- address: address,
- location: location,
- notice: notice
+ var address = doc.address || "";
+ var location = doc.location || {};
+ var notice = doc.notice;
+ var options = doc.options;
+ var config = {
+ mac: mac,
+ address: address,
+ location: location,
+ notice: notice,
+ options: options
+ };
+ if(notice == null || notice == {}) {
+ var userID = doc.userID;
+ db.collection("users").find({"_id": userID}).limit(1).next(function(err, user){
+ if(user) {
+ config[notice] = {
+ tel: user.username,
+ email: user.email,
+ open_id: user.open_id
+ };
+ global.configs[mac] = config;
}
- }
+ });
+ } else {
+ global.configs[mac] = config;
}
});
});
--
Gitblit v1.8.0