Skip to content
Snippets Groups Projects
Commit 06678463 authored by Anthony Gobble's avatar Anthony Gobble
Browse files

Database Updates

parent 0f61281c
No related branches found
No related tags found
No related merge requests found
...@@ -244,7 +244,7 @@ print( "MAR APP1 water used : ",monthly_water_usg_MAR ) ...@@ -244,7 +244,7 @@ print( "MAR APP1 water used : ",monthly_water_usg_MAR )
# weather api to get temp from history # weather api to get temp from history
# Used this to help me understand and gather API.data: https://pypi.org/project/requests/ and https://realpython.com/api-integration-in-python/ # Used this to help me understand and gather API.data: https://pypi.org/project/requests/ and https://realpython.com/api-integration-in-python/
class Temprature_data: class Temperature_data:
def __init__(self,temp_power,temp_cost): def __init__(self,temp_power,temp_cost):
self.temp_power=temp_power self.temp_power=temp_power
self.temp_cost=temp_cost self.temp_cost=temp_cost
...@@ -285,7 +285,7 @@ for i in range(0,len(daily_arr)): ...@@ -285,7 +285,7 @@ for i in range(0,len(daily_arr)):
min_op=sum*60+(d_t+w_t) min_op=sum*60+(d_t+w_t)
watts_per_day=(min_op)*3500 watts_per_day=(min_op)*3500
ct_per_day=((watts_per_day/1000)*0.12)/100 ct_per_day=((watts_per_day/1000)*0.12)/100
App3_History[time_stamp4]=Temprature_data(watts_per_day,ct_per_day) App3_History[time_stamp4]=Temperature_data(watts_per_day,ct_per_day)
time_stamp4+=1 time_stamp4+=1
#print(ct_per_day) #print(ct_per_day)
#print(watts_per_day) #print(watts_per_day)
......
import psycopg2 import psycopg2
# import CS_499_backend # import CS_499_backend
from CS_499_backend import Door_Window, Appliance_1, Appliance_with_Water, Temperature_data from CS_499_backend import Door_Window, Appliance_1, Appliance_with_Water, Temperature_data, Door_Window_History, App1_History, App2_History, App3_History, time_stamp, time_stamp2, time_stamp3, time_stamp4
# create a new database # create a new database
conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432") conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432")
cur = conn.cursor() cur = conn.cursor()
cur.execute("CREATE DATABASE Team3 ") #cur.execute("CREATE DATABASE Team3 ")
conn.close() conn.close()
# create a new table for Door_Window_History # create a new table for Door_Window_History
conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432") conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432")
cur = conn.cursor() cur = conn.cursor()
cur.execute(""" cur.execute("""
DROP TABLE IF EXISTS Door_Window_History;
CREATE TABLE Door_Window_History ( CREATE TABLE Door_Window_History (
id SERIAL PRIMARY KEY, id SERIAL PRIMARY KEY,
day VARCHAR(255), day VARCHAR(255),
...@@ -25,75 +26,74 @@ cur.execute(""" ...@@ -25,75 +26,74 @@ cur.execute("""
conn.commit() conn.commit()
# insert the data into the Door_Window_History table #insert the data into the Door_Window_History table
for i in Door_Window_History: for i in Door_Window_History:
cur.execute(""" for time_stamp, data in Door_Window_History.items():
INSERT INTO Door_Window_History ( cur.execute("""
day, door_status, door_time, window_status, window_time) INSERT INTO Door_Window_History (
day, door_status, door_time, window_status, window_time)
VALUES (%s, %s, %s, %s, %s); VALUES (%s, %s, %s, %s, %s);
""", ( """, (
Door_Window_History[i].day, Door_Window_History[i].Door_status, Door_Window_History[i].Door_time, data.day, data.Door_status, data.Door_time,
Door_Window_History[i].Window_status, Door_Window_History[i].Window_time data.Window_status, data.Window_time
)) ))
conn.commit() conn.commit()
# create a new table for App1_History # create a new table for App1_History
conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432") conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432")
cur = conn.cursor()
cur.execute(""" cur.execute("""
CREATE TABLE App1_History ( DROP TABLE IF EXISTS Appliance_1_History;
id SERIAL PRIMARY KEY, CREATE TABLE Appliance_1_History (
id SERIAL PRIMARY KEY,
day VARCHAR(255), day VARCHAR(255),
micro_pwr FLOAT, micro_pwr FLOAT,
stove_pwr FLOAT, stove_pwr FLOAT,
oven_pwr FLOAT, oven_pwr FLOAT,
Lrtv_pwr FLOAT, Lrtv_pwr FLOAT,
Brtv_pwr FLOAT, Brtv_pwr FLOAT,
fridge_pwr FLOAT, fridge_pwr FLOAT,
lights_pwr FLOAT,
micro_ct FLOAT, micro_ct FLOAT,
stove_ct FLOAT, stove_ct FLOAT,
oven_ct FLOAT, oven_ct FLOAT,
Lrtv_ct FLOAT, Lrtv_ct FLOAT,
Brtv_ct FLOAT, Brtv_ct FLOAT,
fridge_ct FLOAT, fridge_ct FLOAT,
lights_pwr FLOAT,
lights_ct FLOAT lights_ct FLOAT
); );
""") """)
conn.commit() for time_stamp2, data in App1_History.items():
# insert the data into the App1_History table
for i in App1_History:
cur.execute(""" cur.execute("""
INSERT INTO App1_History ( INSERT INTO Appliance_1_History (
day, micro_pwr, stove_pwr, oven_pwr, Lrtv_pwr, Brtv_pwr, day, micro_pwr, stove_pwr, oven_pwr, Lrtv_pwr, Brtv_pwr, fridge_pwr,
fridge_pwr, lights_pwr, micro_ct, stove_ct, oven_ct, Lrtv_ct, micro_ct, stove_ct, oven_ct, Lrtv_ct, Brtv_ct, fridge_ct, lights_pwr, lights_ct)
Brtv_ct, fridge_ct, lights_ct
)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s); VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
""", ( """, (
App1_History[i].day, App1_History[i].micro_pwr, App1_History[i].stove_pwr, data.day, data.micro_pwr, data.stove_pwr, data.oven_pwr, data.Lrtv_pwr, data.Brtv_pwr,
App1_History[i].oven_pwr, App1_History[i].Lrtv_pwr, App1_History[i].Brtv_pwr, data.fridge_pwr, data.micro_ct, data.stove_ct, data.oven_ct, data.Lrtv_ct, data.Brtv_ct,
App1_History[i].fridge_pwr, App1_History[i].lights_pwr, App1_History[i].micro_ct, data.fridge_ct, data.lights_pwr, data.lights_ct
App1_History[i].stove_ct, App1_History[i].oven_ct, App1_History[i].Lrtv_ct, ))
App1_History[i].Brtv_ct, App1_History[i].fridge_ct, App1_History[i].lights_ct conn.commit()
))
# create a new table for appliance_with_water # create a new table for appliance_with_water
conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432") conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432")
cur = conn.cursor()
cur.execute(""" cur.execute("""
DROP TABLE IF EXISTS appliance_with_water;
CREATE TABLE appliance_with_water ( CREATE TABLE appliance_with_water (
id SERIAL PRIMARY KEY, id SERIAL PRIMARY KEY,
day TEXT, day TEXT,
water_heat_pwr FLOAT, water_heat_pwr FLOAT,
dishwasher_pwr FLOAT, dishwasher_pwr FLOAT,
clothes_wash_pwr FLOAT, clothes_wash_pwr FLOAT,
clothes_dry_pwr FLOAT, clothes_dry_pwr FLOAT,
bath_fans_pwr FLOAT, bath_fans_pwr FLOAT,
water_heat_ug FLOAT, water_heat_ug FLOAT,
bath_water_ug FLOAT, bath_water_ug FLOAT,
shower_water_ug FLOAT, shower_water_ug FLOAT,
dishwasher_ug FLOAT, dishwasher_ug FLOAT,
clothes_wash_ug FLOAT, clothes_wash_ug FLOAT,
...@@ -105,50 +105,58 @@ cur.execute(""" ...@@ -105,50 +105,58 @@ cur.execute("""
water_ct FLOAT, water_ct FLOAT,
bath INT, bath INT,
shower INT shower INT
); );
""") """)
conn.commit()
# insert data into the App2_History table # insert data into the App2_History table
for timestamp, data in App2_History.items(): for time_stamp3, data in App2_History.items():
cur.execute(""" cur = conn.cursor()
cur.execute("""
INSERT INTO appliance_with_water ( INSERT INTO appliance_with_water (
day, water_heat_pwr, dishwasher_pwr, clothes_wash_pwr, day, water_heat_pwr, dishwasher_pwr, clothes_wash_pwr,
clothes_dry_pwr, bath_fans_pwr, water_heat_ug, bath_water_ug, clothes_dry_pwr, bath_fans_pwr, water_heat_ug, bath_water_ug,
shower_water_ug, dishwasher_ug, clothes_wash_ug, water_heat_ct, shower_water_ug, dishwasher_ug, clothes_wash_ug, water_heat_ct,
dishwasher_ct, clothes_wash_ct, clothes_dry_ct, bath_fans_ct, dishwasher_ct, clothes_wash_ct, clothes_dry_ct, bath_fans_ct,
water_ct, bath, shower water_ct, bath, shower
) )
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s); VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
""", ( """, (
data.day, data.Water_Heat_pwr, data.DishWasher_pwr, data.Clothes_Wash_pwr, data.day, data.Water_Heat_pwr, data.DishWasher_pwr, data.Clothes_Wash_pwr,
data.Clothes_dry_pwr, data.bath_fans_pwr, data.Water_Heat_ug, data.Bath_water_ug, data.Clothes_dry_pwr, data.bath_fans_pwr, data.Water_Heat_ug, data.Bath_water_ug,
data.Shower_water_ug, data.DishWasher_ug, data.Clothes_Wash_ug, data.Water_Heat_ct, data.Shower_water_ug, data.DishWasher_ug, data.Clothes_Wash_ug, data.Water_Heat_ct,
data.DishWasher_ct, data.Clothes_Wash_ct, data.Clothes_dry_ct, data.bath_fans_ct, data.DishWasher_ct, data.Clothes_Wash_ct, data.Clothes_dry_ct, data.bath_fans_ct,
data.Water_ct, data.bath, data.shower data.Water_ct, data.bath, data.shower
)) ))
conn.commit()
# create a new table for Temperature_data # create a new table for Temperature_data
conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432") conn = psycopg2.connect(database="Team3DB", user="Team3", password="team3", host="138.26.48.83", port="5432")
cur = conn.cursor()
cur.execute(""" cur.execute("""
DROP TABLE IF EXISTS Temperature_data;
CREATE TABLE Temperature_data ( CREATE TABLE Temperature_data (
id SERIAL PRIMARY KEY, id SERIAL PRIMARY KEY,
temp_power FLOAT, temp_power FLOAT,
temp_cost FLOAT temp_cost FLOAT
); );
""") """)
conn.commit()
# insert data into the App3_History Table # insert data into the App3_History Table
for i in App3_Histroy: for time_stamp4, data in App3_History.items():
cur = conn.cursor()
cur.execute(""" cur.execute("""
INSERT INTO temperature_data ( INSERT INTO temperature_data (
temp_power, temp_cost temp_power, temp_cost
) )
VALUES (%s, %s); VALUES (%s, %s);
""", ( """, (
App3_History[i].temp_power, App3_History[i].temp_cost data.temp_power, data.temp_cost
)) ))
conn.commit()
# Commit changes # Commit changes
conn.commit() #conn.commit()
cur.close() cur.close()
conn.close() conn.close()
\ No newline at end of file
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment