seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added alternative parameter meter_uuid to meterenergy report

pull/116/head
13621160019@163.com 2022-01-17 23:06:46 +08:00
parent 8c9b55b298
commit 54d1952cc0
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
myems-api/MyEMS.postman_collection.json
View File

@ -11133,7 +11133,14 @@
"query": [ "query": [
{ {
"key": "meterid", "key": "meterid",
"value": "6" "value": "6",
"description": "use meter id or meteruuid"
},
{
"key": "meteruuid",
"value": "5ca47bc5-22c2-47fc-b906-33222191ea40",
"description": "use meter id or meteruuid",
"disabled": true
}, },
{ {
"key": "periodtype", "key": "periodtype",

8
myems-api/reports/meterenergy.py
View File

@ -6,6 +6,7 @@ from datetime import datetime, timedelta, timezone
from core import utilities from core import utilities
from decimal import Decimal from decimal import Decimal
import excelexporters.meterenergy import excelexporters.meterenergy
import re
class Reporting: class Reporting:
@ -32,6 +33,7 @@ class Reporting:
@staticmethod @staticmethod
def on_get(req, resp): def on_get(req, resp):
print(req.params) print(req.params)
# this procedure accepts meter id or meter uuid to identify a meter
meter_id = req.params.get('meterid') meter_id = req.params.get('meterid')
meter_uuid = req.params.get('meteruuid') meter_uuid = req.params.get('meteruuid')
period_type = req.params.get('periodtype') period_type = req.params.get('periodtype')
@ -53,6 +55,10 @@ class Reporting:
if meter_uuid is not None: if meter_uuid is not None:
meter_uuid = str.strip(meter_uuid) meter_uuid = str.strip(meter_uuid)
regex = re.compile('^[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}\Z', re.I)
match = regex.match(meter_uuid)
if not bool(match):
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_METER_UUID')
if period_type is None: if period_type is None:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE') raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
@ -142,7 +148,7 @@ class Reporting:
" FROM tbl_meters m, tbl_energy_categories ec " " FROM tbl_meters m, tbl_energy_categories ec "
" WHERE m.id = %s AND m.energy_category_id = ec.id ", (meter_id,)) " WHERE m.id = %s AND m.energy_category_id = ec.id ", (meter_id,))
row_meter = cursor_system.fetchone() row_meter = cursor_system.fetchone()
if meter_uuid is not None: elif meter_uuid is not None:
cursor_system.execute(" SELECT m.id, m.name, m.cost_center_id, m.energy_category_id, " cursor_system.execute(" SELECT m.id, m.name, m.cost_center_id, m.energy_category_id, "
" ec.name, ec.unit_of_measure, ec.kgce, ec.kgco2e " " ec.name, ec.unit_of_measure, ec.kgce, ec.kgco2e "
" FROM tbl_meters m, tbl_energy_categories ec " " FROM tbl_meters m, tbl_energy_categories ec "