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-13 10:28:40 +08:00
parent 4fe812cde2 63397a1eee
commit 87ad8bad93
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
myems-api/README.md
View File

@ -741,6 +741,7 @@ Result
| is_output_counted | boolean | Indicates if the Equipment's energy output is counted for aggregating| |
| cost_center | Object | Cost Center Object |
| description | string | Equipment description |
| qrcode | string | QRCode in String |
* GET All Equipments
```bash
@ -853,6 +854,7 @@ Result
| is_output_counted | boolean | Indicates if the combined equipment's energy output is counted for aggregating| |
| cost_center | Object | Cost Center Object |
| description | string | Combined Equipment description |
| qrcode | string | QRCode in String |
* GET All Equipments
```bash
@ -1874,6 +1876,7 @@ Result
| contact | Object | Contact Object |
| cost_center | Object | Cost Center Object |
| description | string | Tenant description |
| qrcode | string | QRCode in String |
* GET All Tenants
```bash

6
myems-api/core/combinedequipment.py
View File

@ -51,7 +51,8 @@ class CombinedEquipmentCollection:
"is_input_counted": bool(row['is_input_counted']),
"is_output_counted": bool(row['is_output_counted']),
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'combinedequipment:' + row['uuid']}
result.append(meta_result)
cursor.close()
@ -198,7 +199,8 @@ class CombinedEquipmentItem:
"is_input_counted": bool(row['is_input_counted']),
"is_output_counted": bool(row['is_output_counted']),
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'combinedequipment:' + row['uuid']}
resp.text = json.dumps(meta_result)

6
myems-api/core/equipment.py
View File

@ -51,7 +51,8 @@ class EquipmentCollection:
"is_input_counted": bool(row['is_input_counted']),
"is_output_counted": bool(row['is_output_counted']),
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'equipment:' + row['uuid']}
result.append(meta_result)
cursor.close()
@ -198,7 +199,8 @@ class EquipmentItem:
"is_input_counted": bool(row['is_input_counted']),
"is_output_counted": bool(row['is_output_counted']),
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'equipment:' + row['uuid']}
resp.text = json.dumps(meta_result)

6
myems-api/core/tenant.py
View File

@ -100,7 +100,8 @@ class TenantCollection:
"is_in_lease": bool(row['is_in_lease']),
"contact": contact,
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'tenant:' + row['uuid']}
result.append(meta_result)
cursor.close()
@ -396,7 +397,8 @@ class TenantItem:
"is_in_lease": bool(row['is_in_lease']),
"contact": contact,
"cost_center": cost_center,
"description": row['description']}
"description": row['description'],
"qrcode": 'tenant:' + row['uuid']}
resp.text = json.dumps(meta_result)