From 97a36a084bb3e7f109723b8ecc105e1f44160a11 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 21 Jan 2017 10:52:03 +0800
Subject: [PATCH] bugfix - 保存每种气体监测等级并传递数据到后续服务组件
---
method.js | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/method.js b/method.js
index 7e89d44..3cad431 100644
--- a/method.js
+++ b/method.js
@@ -271,12 +271,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