From 6c3ca2314f249540aca24f3d92ba366eda126afe Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 12 Jan 2022 21:34:53 +0800
Subject: [PATCH] added qrcode to shopfloor

---
 myems-api/README.md         |  1 +
 myems-api/core/shopfloor.py | 32 +++++---------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/myems-api/README.md b/myems-api/README.md
index fac40e9ac3..2e27db4a5e 100644
--- a/myems-api/README.md
+++ b/myems-api/README.md
@@ -1411,6 +1411,7 @@ Result
 | contact       | Object    | Contact Object                            |
 | cost_center   | Object    | Cost Center Object                        |
 | description   | string    | Shopfloor description                     |
+| qrcode        | string    | QRCode in String                          |
 
 *   GET All Shopfloors
 ```bash
diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py
index 71cc7dab42..fa4e93ef9e 100644
--- a/myems-api/core/shopfloor.py
+++ b/myems-api/core/shopfloor.py
@@ -21,18 +21,6 @@ def on_get(req, resp):
         cnx = mysql.connector.connect(**config.myems_system_db)
         cursor = cnx.cursor(dictionary=True)
 
-        query = (" SELECT id, name, uuid "
-                 " FROM tbl_shopfloors ")
-        cursor.execute(query)
-        rows_shopfloors = cursor.fetchall()
-
-        shopfloor_dict = dict()
-        if rows_shopfloors is not None and len(rows_shopfloors) > 0:
-            for row in rows_shopfloors:
-                shopfloor_dict[row['id']] = {"id": row['id'],
-                                             "name": row['name'],
-                                             "uuid": row['uuid']}
-
         query = (" SELECT id, name, uuid "
                  " FROM tbl_contacts ")
         cursor.execute(query)
@@ -77,7 +65,8 @@ def on_get(req, resp):
                                "is_input_counted": bool(row['is_input_counted']),
                                "contact": contact,
                                "cost_center": cost_center,
-                               "description": row['description']}
+                               "description": row['description'],
+                               "qrcode": "shopfloor:" + row['uuid']}
                 result.append(meta_result)
 
         cursor.close()
@@ -210,23 +199,11 @@ def on_options(req, resp, id_):
     def on_get(req, resp, id_):
         if not id_.isdigit() or int(id_) <= 0:
             raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
-                                   description='API.INVALID_METER_ID')
+                                   description='API.INVALID_SHOPFLOOR_ID')
 
         cnx = mysql.connector.connect(**config.myems_system_db)
         cursor = cnx.cursor(dictionary=True)
 
-        query = (" SELECT id, name, uuid "
-                 " FROM tbl_shopfloors ")
-        cursor.execute(query)
-        rows_shopfloors = cursor.fetchall()
-
-        shopfloor_dict = dict()
-        if rows_shopfloors is not None and len(rows_shopfloors) > 0:
-            for row in rows_shopfloors:
-                shopfloor_dict[row['id']] = {"id": row['id'],
-                                             "name": row['name'],
-                                             "uuid": row['uuid']}
-
         query = (" SELECT id, name, uuid "
                  " FROM tbl_contacts ")
         cursor.execute(query)
@@ -273,7 +250,8 @@ def on_get(req, resp, id_):
                            "is_input_counted": bool(row['is_input_counted']),
                            "contact": contact,
                            "cost_center": cost_center,
-                           "description": row['description']}
+                           "description": row['description'],
+                           "qrcode": "shopfloor:" + row['uuid']}
 
         resp.text = json.dumps(meta_result)