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

Merge branch 'develop'

pull/117/head
13621160019@163.com 2022-01-12 12:04:01 +08:00
parent 3cc74e1322 85a2728faf
commit c560e90c7e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
myems-api/README.md
View File

@ -1089,6 +1089,7 @@ Result
| energy_item | Object | Energy Item Object | | energy_item | Object | Energy Item Object |
| master_meter | Object | Master Meter Object | | master_meter | Object | Master Meter Object |
| description | string | Meter description | | description | string | Meter description |
| qrcode | string | Meter QRCode String |
* GET All Meters * GET All Meters
```bash ```bash

8
myems-api/core/meter.py
View File

@ -1,9 +1,9 @@
import falcon import falcon
import simplejson as json import simplejson as json
import mysql.connector import mysql.connector
import config
import uuid import uuid
from core.useractivity import user_logger, access_control from core.useractivity import user_logger, access_control
import config
class MeterCollection: class MeterCollection:
@ -94,7 +94,8 @@ class MeterCollection:
"cost_center": cost_center, "cost_center": cost_center,
"energy_item": energy_item, "energy_item": energy_item,
"master_meter": master_meter, "master_meter": master_meter,
"description": row['description']} "description": row['description'],
"qrcode": "meter:" + row['uuid']}
result.append(meta_result) result.append(meta_result)
cursor.close() cursor.close()
@ -367,7 +368,8 @@ class MeterItem:
"cost_center": cost_center, "cost_center": cost_center,
"energy_item": energy_item, "energy_item": energy_item,
"master_meter": master_meter, "master_meter": master_meter,
"description": row['description']} "description": row['description'],
"qrcode": "meter:"+row['uuid']}
resp.text = json.dumps(meta_result) resp.text = json.dumps(meta_result)

3
myems-api/core/utilities.py
View File

@ -1,10 +1,9 @@
import calendar
from datetime import datetime, timedelta from datetime import datetime, timedelta
import mysql.connector import mysql.connector
import collections import collections
from decimal import Decimal from decimal import Decimal
import config
import statistics import statistics
import config
######################################################################################################################## ########################################################################################################################