simon
/
aqi_monitor
mirror of https://github.com/bbilly1/aqi_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating input function for new db layout

This commit is contained in:
simon 2021-06-04 18:25:09 +07:00
parent 78a628dc4f
commit a8641d94a6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/flask/app/db_connect.py
View File

@ -46,21 +46,22 @@ def db_insert(config, json_dict):
weather_icon = json_dict['weather_icon'] weather_icon = json_dict['weather_icon']
wind_speed = json_dict['wind_speed'] wind_speed = json_dict['wind_speed']
wind_direction = json_dict['wind_direction'] wind_direction = json_dict['wind_direction']
sensor_id = json_dict['sensor_id']
# connect # connect
conn, cur = db_connect(config) conn, cur = db_connect(config)
# insert aqi # insert aqi
cur.execute("INSERT INTO aqi \ cur.execute("INSERT INTO aqi \
(epoch_time, time_stamp, uptime, pm25, pm10, aqi_value, aqi_category) \ (epoch_time, sensor_id, time_stamp, uptime, pm25, pm10, aqi_value, aqi_category) \
VALUES (%s, %s, %s, %s, %s, %s, %s)", VALUES (%s, %s, %s, %s, %s, %s, %s, %s)",
(epoch_time, time_stamp, uptime, pm25, pm10, aqi_value, aqi_category) (epoch_time, sensor_id, time_stamp, uptime, pm25, pm10, aqi_value, aqi_category)
) )
# insert weather # insert weather
cur.execute("INSERT INTO weather \ cur.execute("INSERT INTO weather \
(epoch_time, time_stamp, temperature, pressure, humidity, \ (epoch_time, sensor_id, time_stamp, temperature, pressure, humidity, \
wind_speed, wind_direction, weather_name, weather_icon) \ wind_speed, wind_direction, weather_name, weather_icon) \
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)", VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
(epoch_time, time_stamp, temperature, pressure, humidity, (epoch_time, sensor_id, time_stamp, temperature, pressure, humidity,
wind_speed, wind_direction, weather_name, weather_icon) wind_speed, wind_direction, weather_name, weather_icon)
) )

14
postgres/setup.sql
View File

@ -1,6 +1,8 @@
-- create aqi table -- create aqi table
CREATE TABLE aqi ( CREATE TABLE aqi (
epoch_time INT NOT NULL PRIMARY KEY, id SERIAL NOT NULL PRIMARY KEY,
epoch_time INT NOT NULL,
sensor_id SMALLINT NOT NULL,
time_stamp VARCHAR(20) NOT NULL, time_stamp VARCHAR(20) NOT NULL,
uptime INT NOT NULL, uptime INT NOT NULL,
pm25 FLOAT4 NOT NULL, pm25 FLOAT4 NOT NULL,
@ -12,6 +14,7 @@ CREATE TABLE aqi (
-- example aqi insert -- example aqi insert
INSERT INTO aqi ( INSERT INTO aqi (
epoch_time, epoch_time,
sensor_id,
time_stamp, time_stamp,
uptime, uptime,
pm25, pm25,
@ -19,13 +22,15 @@ INSERT INTO aqi (
aqi_value, aqi_value,
aqi_category aqi_category
) VALUES ( ) VALUES (
1613648178, '2021-02-18 18:36:18', 206728, 20.4, 22.8, 67.0, 'Moderate' 1613648178, 1, '2021-02-18 18:36:18', 206728, 20.4, 22.8, 67.0, 'Moderate'
); );
-- create weather table -- create weather table
CREATE TABLE weather ( CREATE TABLE weather (
epoch_time INT NOT NULL PRIMARY KEY, id SERIAL NOT NULL PRIMARY KEY,
epoch_time INT NOT NULL,
sensor_id SMALLINT NOT NULL,
time_stamp VARCHAR(20) NOT NULL, time_stamp VARCHAR(20) NOT NULL,
temperature FLOAT4 NOT NULL, temperature FLOAT4 NOT NULL,
pressure FLOAT4 NOT NULL, pressure FLOAT4 NOT NULL,
@ -39,6 +44,7 @@ CREATE TABLE weather (
-- example weather insert -- example weather insert
INSERT INTO weather ( INSERT INTO weather (
epoch_time, epoch_time,
sensor_id,
time_stamp, time_stamp,
temperature, temperature,
pressure, pressure,
@ -48,6 +54,6 @@ INSERT INTO weather (
weather_name, weather_name,
weather_icon weather_icon
) VALUES ( ) VALUES (
1613648178, '2021-02-18 18:36:18', 27.32, 982.41, 1613648178, 1, '2021-02-18 18:36:18', 27.32, 982.41,
39.62598, 3.09, 40, 'Clouds', '04n' 39.62598, 3.09, 40, 'Clouds', '04n'
); );