From d28e393c134e12e131a26740ef99cb76278ef907 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Wed, 24 Jan 2018 14:38:38 +0800 Subject: [PATCH] updated --- create_minutely_data.js | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/create_minutely_data.js b/create_minutely_data.js index de315ec..fdfb3db 100644 --- a/create_minutely_data.js +++ b/create_minutely_data.js @@ -7,12 +7,14 @@ mysqlClient.connect(function(error) { if (error) return; - console.log("connected to MySQL"); + //console.log("connected to MySQL"); }); -var start_date = '2017-11-12'; -var end_date = '2017-11-12'; +var start_date = moment().add(-1, 'days').format('YYYY-MM-DD');//'2017-11-11'; +var end_date = moment().add(-1, 'days').format('YYYY-MM-DD');//'2018-01-03'; + +console.log(moment().format('YYYY-MM-DD HH:mm:ss') + " => sync minutely data from " + start_date + " to " + end_date); var days = moment(end_date).diff(moment(start_date), 'days'); for (var i = 0; i <= days; i++) { @@ -22,7 +24,7 @@ for(var k = 0; k < 60; k++) { var start = moment(date_hour).add(k, 'minutes').format("YYYY-MM-DD HH:mm:00"); var end = moment(date_hour).add(k+1, 'minutes').format("YYYY-MM-DD HH:mm:00"); - // console.log(start + " : " + end); + //console.log(start + " : " + end); fetchDeviceMinutelyData(start, end); } @@ -48,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]["wave"] == null) { - devices[mac]["wave"] = {}; - } - devices[mac]["wave"][key] = [data.min_val, data.max_val] + devices[mac][key] = [val, data.min_val, data.max_val]; }); var device_data = []; -- Gitblit v1.8.0