From 99e92a5304ec93d5fd0b9d739215bbc73945f005 Mon Sep 17 00:00:00 2001
From: 沈斌 <23420800@qq.com>
Date: Tue, 31 Jan 2017 15:22:51 +0800
Subject: [PATCH] 环境数云端接口程序代码优化，三级警报配置信息移至配置文件中
---
method.js | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/method.js b/method.js
index 7e89d44..cdbe1e8 100644
--- a/method.js
+++ b/method.js
@@ -173,26 +173,8 @@
var _config = global.configs[mac];
if(_config == null) {
- _config = {
- mac: mac,
- address: "���������������������������������",
- location: {
- lat:31.430616,
- lng:120.988327
- },
- notice: {
- 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]
- }
- };
+ _config = config.ALARM_DEFAULTS;
+ _config.mac = mac;
configs[mac] = _config;
}
@@ -271,12 +253,15 @@
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);
+ var level = Math.max(level1, level2, level3, level4, level5);
+ if(level > 0) {
+ sensor_data._id = doc.insertedId;
+ sensor_data.level = level;
+ sensor_data.notice = _config.notice;
+ sensor_data.address = _config.address;
+ sensor_data.data.levels = [level1, level2, level3, level4, level5];
+ queue.pushToMQ('ex_data_alarm', sensor_data);
+ }
callback(doc, rank);
});
--
Gitblit v1.8.0