add func to api
This commit is contained in:
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
instance
|
||||||
|
venv
|
||||||
34
app.py
34
app.py
@@ -27,7 +27,6 @@ def index():
|
|||||||
@app.route("/api/getaverageperminute")
|
@app.route("/api/getaverageperminute")
|
||||||
def getaverageperhour():
|
def getaverageperhour():
|
||||||
query = db.session.query(Data).order_by(Data.addTime.desc()).limit(6).all()
|
query = db.session.query(Data).order_by(Data.addTime.desc()).limit(6).all()
|
||||||
print(query)
|
|
||||||
temp1Data = []
|
temp1Data = []
|
||||||
temp2Data = []
|
temp2Data = []
|
||||||
hum1Data = []
|
hum1Data = []
|
||||||
@@ -35,10 +34,37 @@ def getaverageperhour():
|
|||||||
for data in query:
|
for data in query:
|
||||||
temp1Data.append(data.temp1)
|
temp1Data.append(data.temp1)
|
||||||
temp2Data.append(data.temp2)
|
temp2Data.append(data.temp2)
|
||||||
hum1Data.append(data.hum1)
|
hum1Data.append(data.vlaz1)
|
||||||
hum2 , Data.append(data.hum1)
|
hum2Data.append(data.vlaz2)
|
||||||
|
|
||||||
|
return str(temp2Data)
|
||||||
|
|
||||||
|
app.route("/api/getaverageperhour")
|
||||||
|
def getaverageperminute():
|
||||||
|
"""
|
||||||
|
За час берём среднее за минуту и по 60 точкам строии
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
|
||||||
|
pass
|
||||||
|
|
||||||
|
app.route("/api/getaverageperday")
|
||||||
|
def getaverageperday():
|
||||||
|
"""
|
||||||
|
Берём сроеднее по часам и строим по 24 точкам график
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
app.route("/api/getaverageperweek")
|
||||||
|
def getaverageperweek():
|
||||||
|
"""
|
||||||
|
берём среднее за дни и строим по 7 точкам
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
return str("last_200_records_sorted")
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
app.run(debug=True, host='0.0.0.0', port='3800')
|
app.run(debug=True, host='0.0.0.0', port='3800')
|
||||||
1315
static/css/jquery-ui.css
vendored
Normal file
1315
static/css/jquery-ui.css
vendored
Normal file
File diff suppressed because it is too large
Load Diff
19070
static/js/jquery-ui.js
vendored
Normal file
19070
static/js/jquery-ui.js
vendored
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user