From d76a08aeb381091be31f03e7c62988fd3b2b8760 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 17 Apr 2018 17:21:44 +0800
Subject: [PATCH] 服务器迁移
---
method.js | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/method.js b/method.js
index a1a4cd1..254054f 100644
--- a/method.js
+++ b/method.js
@@ -164,7 +164,10 @@
var p3 = this.toDec(fields[47]);
var p4 = this.toDec(fields[48]);
var fei = this.toDec(fields[58]);
- var ferval = this.toDec(fields[59]);
+ //var ferval = this.toDec(fields[59]);
+
+ var feival = this.toDec(fields[71]) == 0 ? (this.toDec(fields[72]) * 256 + this.toDec(fields[73])) : -1 * (this.toDec(fields[72]) * 256 + this.toDec(fields[73]));
+
var t = this.toDec(fields[56]);
var aqi = this.toDec(fields[60]) * 256 + this.toDec(fields[61]); //AQI
@@ -184,13 +187,15 @@
mac: mac,
location: _config.location,
data: {
- x0: ferval,
+ x0: feival,
x1: x1, //PM2.5 - (������:ppm)
x2: x3, //PM2.5 - 0.1���0.3um���
x3: x9, //������
x4: x11, //������
x5: x10, //������
- x6: x14 //������������
+ x6: x14, //������������
+
+ mcu: mcu
},
options: _config.options,
time: current.valueOf()
@@ -199,7 +204,7 @@
var rank = 0;
if(s > 0) {
- rank = this.random(1000, 99999);//this.random(1000, 99999999);
+ rank = this.random(100200, 102000);//this.random(1000, 99999999);
db.collection("device_ranks").insertOne({
mac: mac,
rank: rank,
@@ -237,7 +242,7 @@
p3: p3,
p4: p4,
fei: fei,
- ferval: ferval,
+ ferval: feival,
aqi: aqi,
s: s,
rank: rank,
@@ -352,12 +357,15 @@
};
module.exports.initConfigs = function(db) {
+ var _address = config.ALARM_DEFAULTS.address;
+ var _location = config.ALARM_DEFAULTS.location;
+ var _options = config.ALARM_DEFAULTS.options;
db.collection("devices").find().toArray(function(err, docs) {
docs.forEach(function(doc) {
var mac = doc.mac;
- var address = doc.address || config.ALARM_DEFAULTS.address;
- var location = doc.location || config.ALARM_DEFAULTS.location;
- var options = doc.options || config.ALARM_DEFAULTS.options;
+ var address = doc.address || _address;
+ var location = doc.location || _location;
+ var options = doc.options || _options;
var notice = doc.notice;
var config = {
mac: mac,
--
Gitblit v1.8.0