Smikkelbakje/J1B3-Sensor-boxes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor getData and getNodeInfo functions

Browse Source
This commit is contained in:
sietse jonker
2024-04-01 16:13:38 +02:00
parent 5aa494773e
commit 267bb7db9c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/Flask/main.py
View File

@@ -1,7 +1,6 @@
from flask import Flask, request, jsonify from flask import Flask, request, jsonify
import mysql.connector import mysql.connector
from queries import * from queries import *
import ast
app = Flask(__name__) app = Flask(__name__)
@app.route('/getMeasurements') @app.route('/getMeasurements')
@@ -50,10 +49,9 @@ def loginDB():
) )
return mydb return mydb
def getData(node, dataType, MAC, dateStart, dateEnd): def getData(node, dataTypes, MAC, dateStart, dateEnd):
dataTypeTuple = ast.literal_eval(dataType)
mydb = loginDB() mydb = loginDB()
query = get_query(node, dataTypeTuple, MAC, dateStart, dateEnd) query = get_query(node, dataTypes, MAC, False, False, dateStart, dateEnd)
cursor = mydb.cursor(dictionary=True) # Enable dictionary output cursor = mydb.cursor(dictionary=True) # Enable dictionary output
cursor.execute(query) cursor.execute(query)
result = cursor.fetchall() # Fetch the results result = cursor.fetchall() # Fetch the results
@@ -64,7 +62,7 @@ def getData(node, dataType, MAC, dateStart, dateEnd):
def getNodeInfo(macAdress): def getNodeInfo(macAdress):
mydb = loginDB() mydb = loginDB()
query = get_query(False, False, macAdress, False, False) query = get_query(False, False, macAdress, False, False, False, False)
cursor = mydb.cursor(dictionary=True) # Enable dictionary output cursor = mydb.cursor(dictionary=True) # Enable dictionary output
cursor.execute(query) cursor.execute(query)
result = cursor.fetchall() # Fetch the results result = cursor.fetchall() # Fetch the results