Refactor getData function and fix SQL query in queries.py
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from flask import Flask, request, jsonify
|
||||
import mysql.connector
|
||||
from queries import *
|
||||
import ast
|
||||
app = Flask(__name__)
|
||||
|
||||
@app.route('/getMeasurements')
|
||||
@@ -49,9 +50,10 @@ def loginDB():
|
||||
)
|
||||
return mydb
|
||||
|
||||
def getData(node, dataType, MAC, dateStart, dateEnd, type):
|
||||
def getData(node, dataType, MAC, dateStart, dateEnd):
|
||||
dataTypeTuple = ast.literal_eval(dataType)
|
||||
mydb = loginDB()
|
||||
query = get_query(node, dataType, MAC, dateStart, dateEnd, type)
|
||||
query = get_query(node, dataTypeTuple, MAC, dateStart, dateEnd)
|
||||
cursor = mydb.cursor(dictionary=True) # Enable dictionary output
|
||||
cursor.execute(query)
|
||||
result = cursor.fetchall() # Fetch the results
|
||||
|
Reference in New Issue
Block a user