From be5e76a4e01b9ec36768c880fcc0e5d9b3795c05 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 24 Jan 2018 14:22:55 +0800
Subject: [PATCH] updated
---
/dev/null | 0
create_data.js | 2 +-
create_minutely_data.js | 7 +------
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/create_daily_data.js b/create_daily_data.js
deleted file mode 100644
index e69de29..0000000
--- a/create_daily_data.js
+++ /dev/null
diff --git a/create_data.js b/create_data.js
index c81f9ac..30d7694 100644
--- a/create_data.js
+++ b/create_data.js
@@ -21,7 +21,7 @@
fetchDeviceMinutelyData(start, end, days, (i+1)*(j+1)*(k+1));
}
}
-}
+
function fetchDeviceMinutelyData(start, end, d, t) {
pool.getConnection(function (err, conn) {
diff --git a/create_minutely_data.js b/create_minutely_data.js
index 4d8be93..fdfb3db 100644
--- a/create_minutely_data.js
+++ b/create_minutely_data.js
@@ -50,12 +50,7 @@
time: moment(moment(start, 'YYYY-MM-DD HH:mm:00').valueOf() + 8*60*60*1000).toDate()
};
}
- devices[mac][key] = val;
-
- if(devices[mac]["ext"] == null) {
- devices[mac]["ext"] = {};
- }
- devices[mac]["ext"][key] = [data.min_val, data.max_val]
+ devices[mac][key] = [val, data.min_val, data.max_val];
});
var device_data = [];
diff --git a/create_monthly_data.js b/create_monthly_data.js
deleted file mode 100644
index e69de29..0000000
--- a/create_monthly_data.js
+++ /dev/null
diff --git a/create_yearly_data.js b/create_yearly_data.js
deleted file mode 100644
index e69de29..0000000
--- a/create_yearly_data.js
+++ /dev/null
--
Gitblit v1.8.0