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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/method.js b/method.js
index 49ba425..7e89d44 100644
--- a/method.js
+++ b/method.js
@@ -176,13 +176,13 @@
_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: {
@@ -233,6 +233,7 @@
}, function(err, result) { });
}
+ var _this = this;
db.collection("data").insertOne({
mac: mac,
x1: x1,
@@ -265,11 +266,11 @@
}, function(err, doc) {
if (err) return;
- 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]);
+ 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;
@@ -283,6 +284,7 @@
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]) {
--
Gitblit v1.8.0