From 6af787af2761ba250ab836792a5c91847d02c0f5 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Mon, 10 Jan 2022 09:55:51 +0800
Subject: [PATCH] added 'qrcode' parameter to meter

---
 myems-api/core/meter.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py
index 11812ea3..c0a19628 100644
--- a/myems-api/core/meter.py
+++ b/myems-api/core/meter.py
@@ -3,6 +3,7 @@ import simplejson as json
 import mysql.connector
 import config
 import uuid
+
 from core.useractivity import user_logger, access_control
 
 
@@ -94,7 +95,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()
@@ -346,6 +348,21 @@ class MeterItem:
                  " WHERE id = %s ")
         cursor.execute(query, (id_,))
         row = cursor.fetchone()
+
+        query = (" SELECT id, name, uuid "
+                 " FROM tbl_energy_categories ")
+        cursor.execute(query)
+        rows_energy_categories = cursor.fetchall()
+
+        query = (" SELECT id, name, uuid "
+                 " FROM tbl_energy_categories ")
+        cursor.execute(query)
+        rows_energy_categories = cursor.fetchall()
+
+        query = (" SELECT id, name, uuid "
+                 " FROM tbl_energy_categories ")
+        cursor.execute(query)
+        rows_energy_categories = cursor.fetchall()
         cursor.close()
         cnx.disconnect()
 
@@ -367,7 +384,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)