|
@@ -2,7 +2,7 @@
|
|
"cells": [
|
|
"cells": [
|
|
{
|
|
{
|
|
"cell_type": "code",
|
|
"cell_type": "code",
|
|
- "execution_count": 944,
|
|
|
|
|
|
+ "execution_count": 32,
|
|
"metadata": {},
|
|
"metadata": {},
|
|
"outputs": [],
|
|
"outputs": [],
|
|
"source": [
|
|
"source": [
|
|
@@ -17,7 +17,7 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"cell_type": "code",
|
|
"cell_type": "code",
|
|
- "execution_count": 945,
|
|
|
|
|
|
+ "execution_count": 33,
|
|
"metadata": {},
|
|
"metadata": {},
|
|
"outputs": [],
|
|
"outputs": [],
|
|
"source": [
|
|
"source": [
|
|
@@ -30,7 +30,7 @@
|
|
" try :\n",
|
|
" try :\n",
|
|
" if data['data']['function'] == 'metering' :\n",
|
|
" if data['data']['function'] == 'metering' :\n",
|
|
" metering_json['timestamp'] = data['timestamp']\n",
|
|
" metering_json['timestamp'] = data['timestamp']\n",
|
|
- " metering_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\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['dong'] = data['dong']\n",
|
|
" metering_json['ho'] = data['ho']\n",
|
|
" metering_json['ho'] = data['ho']\n",
|
|
" metering_json['electric_instant'] = data['data']['value']['electric'][0]\n",
|
|
" metering_json['electric_instant'] = data['data']['value']['electric'][0]\n",
|
|
@@ -44,9 +44,10 @@
|
|
" metering_json['hotwater_instant'] = data['data']['value']['hotwater'][0]\n",
|
|
" metering_json['hotwater_instant'] = data['data']['value']['hotwater'][0]\n",
|
|
" metering_json['hotwater_cumulative'] = data['data']['value']['hotwater'][1]\n",
|
|
" metering_json['hotwater_cumulative'] = data['data']['value']['hotwater'][1]\n",
|
|
" metering_data += json.dumps(metering_json) + \"\\n\"\n",
|
|
" metering_data += json.dumps(metering_json) + \"\\n\"\n",
|
|
|
|
+ " \n",
|
|
" elif data['data']['function'] == 'current_temperture' :\n",
|
|
" elif data['data']['function'] == 'current_temperture' :\n",
|
|
" temperture_json['timestamp'] = data['timestamp']\n",
|
|
" temperture_json['timestamp'] = data['timestamp']\n",
|
|
- " temperture_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\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['dong'] = data['dong']\n",
|
|
" temperture_json['ho'] = data['ho']\n",
|
|
" temperture_json['ho'] = data['ho']\n",
|
|
" temperture_json['room1'] = data['data']['value']['room1'] if data['data']['value'].get('room1') != None else None\n",
|
|
" temperture_json['room1'] = data['data']['value']['room1'] if data['data']['value'].get('room1') != None else None\n",
|
|
@@ -60,7 +61,7 @@
|
|
" temperature_data += json.dumps(temperture_json) + \"\\n\"\n",
|
|
" temperature_data += json.dumps(temperture_json) + \"\\n\"\n",
|
|
" elif data['data']['function'] == 'energy_meter' :\n",
|
|
" elif data['data']['function'] == 'energy_meter' :\n",
|
|
" energymeter_json['timestamp'] = data['timestamp']\n",
|
|
" energymeter_json['timestamp'] = data['timestamp']\n",
|
|
- " energymeter_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\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['dong'] = data['dong']\n",
|
|
" energymeter_json['ho'] = data['ho']\n",
|
|
" energymeter_json['ho'] = data['ho']\n",
|
|
" energymeter_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
" energymeter_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
@@ -71,7 +72,7 @@
|
|
" \n",
|
|
" \n",
|
|
" for i in range(0, data['data']['value']['lightCount']) :\n",
|
|
" for i in range(0, data['data']['value']['lightCount']) :\n",
|
|
" energymeter_light_json['timestamp'] = data['timestamp']\n",
|
|
" energymeter_light_json['timestamp'] = data['timestamp']\n",
|
|
- " energymeter_light_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\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['dong'] = data['dong']\n",
|
|
" energymeter_light_json['ho'] = data['ho']\n",
|
|
" energymeter_light_json['ho'] = data['ho']\n",
|
|
" energymeter_light_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
" energymeter_light_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
@@ -83,7 +84,7 @@
|
|
" \n",
|
|
" \n",
|
|
" for i in range(0, data['data']['value']['outletCount']) :\n",
|
|
" for i in range(0, data['data']['value']['outletCount']) :\n",
|
|
" energymeter_outlet_json['timestamp'] = data['timestamp']\n",
|
|
" energymeter_outlet_json['timestamp'] = data['timestamp']\n",
|
|
- " energymeter_outlet_json['site'] = data['site'] if data['site'] != None else 'yeoju' if data['dong'] == 105 else 'sujigwanggyosan'\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['dong'] = data['dong']\n",
|
|
" energymeter_outlet_json['ho'] = data['ho']\n",
|
|
" energymeter_outlet_json['ho'] = data['ho']\n",
|
|
" energymeter_outlet_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
" energymeter_outlet_json['energy_meter_id'] = data['data']['value']['energyMeterId']\n",
|
|
@@ -105,92 +106,7 @@
|
|
"metadata": {
|
|
"metadata": {
|
|
"scrolled": true
|
|
"scrolled": true
|
|
},
|
|
},
|
|
- "outputs": [
|
|
|
|
- {
|
|
|
|
- "name": "stdout",
|
|
|
|
- "output_type": "stream",
|
|
|
|
- "text": [
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n",
|
|
|
|
- "Expecting value: line 1 column 1 (char 0)\n"
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
- ],
|
|
|
|
|
|
+ "outputs": [],
|
|
"source": [
|
|
"source": [
|
|
"s3=boto3.resource('s3')\n",
|
|
"s3=boto3.resource('s3')\n",
|
|
"bucket = s3.Bucket('hdci-ambt-wallpad-raw')\n",
|
|
"bucket = s3.Bucket('hdci-ambt-wallpad-raw')\n",
|
|
@@ -217,12 +133,11 @@
|
|
" minute = obj.key.split('-')[9]\n",
|
|
" minute = obj.key.split('-')[9]\n",
|
|
" second = obj.key.split('-')[10]\n",
|
|
" second = obj.key.split('-')[10]\n",
|
|
"\n",
|
|
"\n",
|
|
- " object = s3.Object('hdci-ambt-wallpad-raw',s3_key)\n",
|
|
|
|
|
|
+ " object = s3.Object('hdci-ambt-wallpad-raw', obj.key)\n",
|
|
" bodystream = object.get()['Body'].read().decode(\"utf-8\")\n",
|
|
" bodystream = object.get()['Body'].read().decode(\"utf-8\")\n",
|
|
" try :\n",
|
|
" try :\n",
|
|
- " for obj in bodystream.split('\\n') :\n",
|
|
|
|
- " if obj != None :\n",
|
|
|
|
- " pre_proecssing(json.loads(obj))\n",
|
|
|
|
|
|
+ " for i in range(0, len(bodystream.split('\\n'))-1):\n",
|
|
|
|
+ " pre_proecssing(json.loads(bodystream.split('\\n')[i]))\n",
|
|
" except ValueError as e:\n",
|
|
" except ValueError as e:\n",
|
|
" print (e)\n",
|
|
" print (e)\n",
|
|
" \n",
|
|
" \n",
|
|
@@ -252,9 +167,9 @@
|
|
],
|
|
],
|
|
"metadata": {
|
|
"metadata": {
|
|
"kernelspec": {
|
|
"kernelspec": {
|
|
- "display_name": "Python 3",
|
|
|
|
|
|
+ "display_name": "conda_python3",
|
|
"language": "python",
|
|
"language": "python",
|
|
- "name": "python3"
|
|
|
|
|
|
+ "name": "conda_python3"
|
|
},
|
|
},
|
|
"language_info": {
|
|
"language_info": {
|
|
"codemirror_mode": {
|
|
"codemirror_mode": {
|
|
@@ -266,7 +181,7 @@
|
|
"name": "python",
|
|
"name": "python",
|
|
"nbconvert_exporter": "python",
|
|
"nbconvert_exporter": "python",
|
|
"pygments_lexer": "ipython3",
|
|
"pygments_lexer": "ipython3",
|
|
- "version": "3.8.3"
|
|
|
|
|
|
+ "version": "3.6.13"
|
|
}
|
|
}
|
|
},
|
|
},
|
|
"nbformat": 4,
|
|
"nbformat": 4,
|