From 3d4d654cb24bc2293d964e8f1bc52418c089c6ee Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 25 Dec 2016 16:25:15 +0800
Subject: [PATCH] Bug修正，解决三级警报被误判成二级的判错误
---
method.js | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/method.js b/method.js
index 6590e33..0148b5d 100644
--- a/method.js
+++ b/method.js
@@ -169,13 +169,14 @@
var current = moment();
- queue.pushToScreen({
+ queue.pushToMQ('ex_data_screen', {
mac: mac,
location: {
lat: 31.430616,
lng: 120.988327
},
data: {
+ x0: ferval,
x1: x1, //PM2.5 - (������:ppm)
x2: x3, //PM2.5 - 0.1���0.3um���
x3: x9, //������
@@ -186,8 +187,14 @@
time: current.valueOf()
});
- if(x1 >= 500) {
- queue.pushToAlarm({
+ if(x1 > 250) {
+ var level = 1;
+ if(x1 > 750) {
+ level = 3;
+ } else if(x1 > 500) {
+ level = 2;
+ }
+ queue.pushToMQ('ex_data_alarm', {
mac: mac,
address: "���������������������������������",
location: {
@@ -195,6 +202,7 @@
lng:120.988327
},
data:{
+ x0: ferval,
x1: x1, //PM2.5
x2: x3, //PM2.5
x3: x9, //������
@@ -202,7 +210,7 @@
x5: x10, //������
x6: x14 //������������
},
- level: 1,
+ level: level,
notice: {
tel: "15950198162",
email: "it01@moral.org.cn",
--
Gitblit v1.8.0