From ee567fd428466945ec8bb290308f3e26287dda63 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 23 Dec 2016 22:36:48 +0800
Subject: [PATCH] 代码优化，重构消息推送函数
---
method.js | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/method.js b/method.js
index 4788af8..f888085 100644
--- a/method.js
+++ b/method.js
@@ -169,23 +169,57 @@
var current = moment();
- queue.pushToScreen({
+ queue.pushToMQ('ex_data_screen', {
mac: mac,
location: {
lat: 31.430616,
lng: 120.988327
},
data: {
- x1: x1, //PM2.5
- x2: x9, //������
- x3: x11, //������
- x4: x10, //������
- x5: x14, //������������
- x6: x12 //������
+ x0: ferval,
+ x1: x1, //PM2.5 - (������:ppm)
+ x2: x3, //PM2.5 - 0.1���0.3um���
+ x3: x9, //������
+ x4: x11, //������
+ x5: x10, //������
+ x6: x14 //������������
},
time: current.valueOf()
});
+ if(x1 > 250) {
+ var level = 1;
+ if(x1 > 500) {
+ level = 2;
+ } else if(x1 > 750) {
+ level = 3;
+ }
+ queue.pushToMQ('ex_data_alarm', {
+ mac: mac,
+ address: "���������������������������������",
+ location: {
+ lat:31.430616,
+ lng:120.988327
+ },
+ data:{
+ x0: ferval,
+ x1: x1, //PM2.5
+ x2: x3, //PM2.5
+ x3: x9, //������
+ x4: x11, //������
+ x5: x10, //������
+ x6: x14 //������������
+ },
+ level: level,
+ notice: {
+ tel: "15950198162",
+ email: "it01@moral.org.cn",
+ open_id: "o-RTuwvMHWotyirPHLmdSB_dKoQU"
+ },
+ time: moment.valueOf()
+ });
+ }
+
var rank = 0;
if(s > 0) {
rank = this.random(1000, 99999);//this.random(1000, 99999999);
--
Gitblit v1.8.0