diff --git a/myems-api/README.md b/myems-api/README.md index 61f54ef2..fac40e9a 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1089,6 +1089,7 @@ Result | energy_item | Object | Energy Item Object | | master_meter | Object | Master Meter Object | | description | string | Meter description | +| qrcode | string | Meter QRCode String | * GET All Meters ```bash diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 11812ea3..a57ce560 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -1,9 +1,9 @@ import falcon import simplejson as json import mysql.connector -import config import uuid from core.useractivity import user_logger, access_control +import config class MeterCollection: @@ -94,7 +94,8 @@ class MeterCollection: "cost_center": cost_center, "energy_item": energy_item, "master_meter": master_meter, - "description": row['description']} + "description": row['description'], + "qrcode": "meter:" + row['uuid']} result.append(meta_result) cursor.close() @@ -367,7 +368,8 @@ class MeterItem: "cost_center": cost_center, "energy_item": energy_item, "master_meter": master_meter, - "description": row['description']} + "description": row['description'], + "qrcode": "meter:"+row['uuid']} resp.text = json.dumps(meta_result) diff --git a/myems-api/core/utilities.py b/myems-api/core/utilities.py index edf55e4e..933fd671 100644 --- a/myems-api/core/utilities.py +++ b/myems-api/core/utilities.py @@ -1,10 +1,9 @@ -import calendar from datetime import datetime, timedelta import mysql.connector import collections from decimal import Decimal -import config import statistics +import config ########################################################################################################################