|
@@ -2,7 +2,7 @@
|
|
|
"cells": [
|
|
|
{
|
|
|
"cell_type": "code",
|
|
|
- "execution_count": 32,
|
|
|
+ "execution_count": 12,
|
|
|
"metadata": {},
|
|
|
"outputs": [],
|
|
|
"source": [
|
|
@@ -17,7 +17,7 @@
|
|
|
},
|
|
|
{
|
|
|
"cell_type": "code",
|
|
|
- "execution_count": 33,
|
|
|
+ "execution_count": 13,
|
|
|
"metadata": {},
|
|
|
"outputs": [],
|
|
|
"source": [
|
|
@@ -29,7 +29,7 @@
|
|
|
" global energymeter_outlet_data\n",
|
|
|
" try :\n",
|
|
|
" if data['data']['function'] == 'metering' :\n",
|
|
|
- " metering_json['timestamp'] = data['timestamp']\n",
|
|
|
+ " metering_json['timestamp'] = str(datetime.strptime(data['timestamp'], \"%Y-%m-%dT%H:%M:%S\"))\n",
|
|
|
" metering_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
|
|
|
" metering_json['dong'] = data['dong']\n",
|
|
|
" metering_json['ho'] = data['ho']\n",
|
|
@@ -46,7 +46,7 @@
|
|
|
" metering_data += json.dumps(metering_json) + \"\\n\"\n",
|
|
|
" \n",
|
|
|
" elif data['data']['function'] == 'current_temperture' :\n",
|
|
|
- " temperture_json['timestamp'] = data['timestamp']\n",
|
|
|
+ " temperture_json['timestamp'] = str(datetime.strptime(data['timestamp'], \"%Y-%m-%dT%H:%M:%S\"))\n",
|
|
|
" temperture_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
|
|
|
" temperture_json['dong'] = data['dong']\n",
|
|
|
" temperture_json['ho'] = data['ho']\n",
|
|
@@ -60,7 +60,7 @@
|
|
|
" temperture_json['room8'] = data['data']['value']['room8'] if data['data']['value'].get('room8') != None else None\n",
|
|
|
" temperature_data += json.dumps(temperture_json) + \"\\n\"\n",
|
|
|
" elif data['data']['function'] == 'energy_meter' :\n",
|
|
|
- " energymeter_json['timestamp'] = data['timestamp']\n",
|
|
|
+ " energymeter_json['timestamp'] = str(datetime.strptime(data['timestamp'], \"%Y-%m-%dT%H:%M:%S\"))\n",
|
|
|
" energymeter_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
|
|
|
" energymeter_json['dong'] = data['dong']\n",
|
|
|
" energymeter_json['ho'] = data['ho']\n",
|
|
@@ -71,7 +71,7 @@
|
|
|
" energymeter_data += json.dumps(energymeter_json) + \"\\n\"\n",
|
|
|
" \n",
|
|
|
" for i in range(0, data['data']['value']['lightCount']) :\n",
|
|
|
- " energymeter_light_json['timestamp'] = data['timestamp']\n",
|
|
|
+ " energymeter_light_json['timestamp'] = str(datetime.strptime(data['timestamp'], \"%Y-%m-%dT%H:%M:%S\"))\n",
|
|
|
" energymeter_light_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
|
|
|
" energymeter_light_json['dong'] = data['dong']\n",
|
|
|
" energymeter_light_json['ho'] = data['ho']\n",
|
|
@@ -83,7 +83,7 @@
|
|
|
" energymeter_light_list.append(copy.deepcopy(energymeter_light_json))\n",
|
|
|
" \n",
|
|
|
" for i in range(0, data['data']['value']['outletCount']) :\n",
|
|
|
- " energymeter_outlet_json['timestamp'] = data['timestamp']\n",
|
|
|
+ " energymeter_outlet_json['timestamp'] = str(datetime.strptime(data['timestamp'], \"%Y-%m-%dT%H:%M:%S\"))\n",
|
|
|
" energymeter_outlet_json['site'] = data['site'] if data.get('site') != None else 'yeoju' if data['dong'] == '105' else 'sujigwanggyosan'\n",
|
|
|
" energymeter_outlet_json['dong'] = data['dong']\n",
|
|
|
" energymeter_outlet_json['ho'] = data['ho']\n",
|
|
@@ -123,35 +123,37 @@
|
|
|
" energymeter_outlet_json = {}\n",
|
|
|
" energymeter_outlet_list = []\n",
|
|
|
" energymeter_outlet_data = \"\"\n",
|
|
|
- " if obj.key.split('/')[0] == 'dev_old_not_use' :\n",
|
|
|
- " break\n",
|
|
|
+ " if obj.key.split('/')[0] != 'dev' :\n",
|
|
|
+ " continue\n",
|
|
|
" \n",
|
|
|
+ " site = obj.key.split('/')[1]\n",
|
|
|
" year = obj.key.split('-')[5]\n",
|
|
|
" month = obj.key.split('-')[6]\n",
|
|
|
" day = obj.key.split('-')[7]\n",
|
|
|
" hour = obj.key.split('-')[8]\n",
|
|
|
" minute = obj.key.split('-')[9]\n",
|
|
|
" second = obj.key.split('-')[10]\n",
|
|
|
- "\n",
|
|
|
+ " \n",
|
|
|
" object = s3.Object('hdci-ambt-wallpad-raw', obj.key)\n",
|
|
|
" bodystream = object.get()['Body'].read().decode(\"utf-8\")\n",
|
|
|
" try :\n",
|
|
|
" for i in range(0, len(bodystream.split('\\n'))-1):\n",
|
|
|
" pre_proecssing(json.loads(bodystream.split('\\n')[i]))\n",
|
|
|
+ " break\n",
|
|
|
" except ValueError as e:\n",
|
|
|
" print (e)\n",
|
|
|
" \n",
|
|
|
- " object = s3.Object('hdci-ambt-wallpad-prep','test/metering/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw','dev-clean/metering/{}/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(site, year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
" object.put(Body=metering_data)\n",
|
|
|
- " object = s3.Object('hdci-ambt-wallpad-prep','test/temperature/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw','dev-clean/temperature/{}/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(site, year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
" object.put(Body=temperature_data)\n",
|
|
|
- " object = s3.Object('hdci-ambt-wallpad-prep','test/energymeter/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw','dev-clean/energymeter/{}/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(site, year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
" object.put(Body=energymeter_data)\n",
|
|
|
- " object = s3.Object('hdci-ambt-wallpad-prep','test/energymeter/light/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw','dev-clean/energymeter-light/{}/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(site, year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
" for obj in energymeter_light_list :\n",
|
|
|
" energymeter_light_data += json.dumps(obj) + '\\n'\n",
|
|
|
" object.put(Body=energymeter_light_data)\n",
|
|
|
- " object = s3.Object('hdci-ambt-wallpad-prep','test/energymeter/outlet/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw','dev-clean/energymeter-outlet/{}/year={}/month={}/day={}/hour={}/ambt-wallpad-prep-dev-{}-{}-{}-{}-{}-{}-{}'.format(site, year, month, day, hour, year, month, day, hour, minute, second, uuid.uuid4()))\n",
|
|
|
" for obj in energymeter_outlet_list :\n",
|
|
|
" energymeter_outlet_data += json.dumps(obj) + '\\n'\n",
|
|
|
" object.put(Body=energymeter_outlet_data)"
|