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

Merge branch 'develop'

pull/142/MERGE
13621160019@163.com 2022-04-12 22:25:33 +08:00
parent 3065e17d66 891f77b5d4
commit 168b92459f
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myems-api/README.md
View File

@ -41,7 +41,7 @@ sudo chmod +x run.sh
./run.sh ./run.sh
``` ```
Quick run on Windows (NOT for production use): Quick run on Windows (NOT for production usage):
Find python path in Command Prompt: Find python path in Command Prompt:
```bash ```bash

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

@ -174,9 +174,9 @@ class CombinedEquipmentItem:
cost_center_dict = dict() cost_center_dict = dict()
if rows_cost_centers is not None and len(rows_cost_centers) > 0: if rows_cost_centers is not None and len(rows_cost_centers) > 0:
for row in rows_cost_centers: for row in rows_cost_centers:
cost_center_dict[row['id']] = {"id": row[0], cost_center_dict[row[0]] = {"id": row[0],
"name": row[1], "name": row[1],
"uuid": row[2]} "uuid": row[2]}
query = (" SELECT id, name, uuid, " query = (" SELECT id, name, uuid, "
" is_input_counted, is_output_counted, " " is_input_counted, is_output_counted, "
@ -1044,7 +1044,7 @@ class CombinedEquipmentParameterItem:
if rows_points is not None and len(rows_points) > 0: if rows_points is not None and len(rows_points) > 0:
for row in rows_points: for row in rows_points:
point_dict[row[0]] = {"id": row[0], point_dict[row[0]] = {"id": row[0],
"name": row[1]} "name": row[1]}
query = (" SELECT id, name, uuid " query = (" SELECT id, name, uuid "
" FROM tbl_meters ") " FROM tbl_meters ")
@ -1405,7 +1405,7 @@ class CombinedEquipmentMeterCollection:
description='API.INVALID_COMBINED_EQUIPMENT_ID') description='API.INVALID_COMBINED_EQUIPMENT_ID')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor(dictionary=True) cursor = cnx.cursor()
cursor.execute(" SELECT name " cursor.execute(" SELECT name "
" FROM tbl_combined_equipments " " FROM tbl_combined_equipments "
@ -1424,9 +1424,9 @@ class CombinedEquipmentMeterCollection:
energy_category_dict = dict() energy_category_dict = dict()
if rows_energy_categories is not None and len(rows_energy_categories) > 0: if rows_energy_categories is not None and len(rows_energy_categories) > 0:
for row in rows_energy_categories: for row in rows_energy_categories:
energy_category_dict[row['id']] = {"id": row['id'], energy_category_dict[row[0]] = {"id": row[0],
"name": row['name'], "name": row[1],
"uuid": row['uuid']} "uuid": row[2]}
query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output " query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output "
" FROM tbl_combined_equipments e, tbl_combined_equipments_meters em, tbl_meters m " " FROM tbl_combined_equipments e, tbl_combined_equipments_meters em, tbl_meters m "
@ -1438,10 +1438,10 @@ class CombinedEquipmentMeterCollection:
result = list() result = list()
if rows is not None and len(rows) > 0: if rows is not None and len(rows) > 0:
for row in rows: for row in rows:
energy_category = energy_category_dict.get(row['energy_category_id'], None) energy_category = energy_category_dict.get(row[3], None)
meta_result = {"id": row['id'], "name": row['name'], "uuid": row['uuid'], meta_result = {"id": row[0], "name": row[1], "uuid": row[2],
"energy_category": energy_category, "energy_category": energy_category,
"is_output": bool(row['is_output'])} "is_output": bool(row[4])}
result.append(meta_result) result.append(meta_result)
resp.text = json.dumps(result) resp.text = json.dumps(result)
@ -1597,7 +1597,7 @@ class CombinedEquipmentOfflineMeterCollection:
description='API.INVALID_COMBINED_EQUIPMENT_ID') description='API.INVALID_COMBINED_EQUIPMENT_ID')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor(dictionary=True) cursor = cnx.cursor()
cursor.execute(" SELECT name " cursor.execute(" SELECT name "
" FROM tbl_combined_equipments " " FROM tbl_combined_equipments "
@ -1616,9 +1616,9 @@ class CombinedEquipmentOfflineMeterCollection:
energy_category_dict = dict() energy_category_dict = dict()
if rows_energy_categories is not None and len(rows_energy_categories) > 0: if rows_energy_categories is not None and len(rows_energy_categories) > 0:
for row in rows_energy_categories: for row in rows_energy_categories:
energy_category_dict[row['id']] = {"id": row['id'], energy_category_dict[row[0]] = {"id": row[0],
"name": row['name'], "name": row[1],
"uuid": row['uuid']} "uuid": row[2]}
query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output " query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output "
" FROM tbl_combined_equipments e, tbl_combined_equipments_offline_meters em, tbl_offline_meters m " " FROM tbl_combined_equipments e, tbl_combined_equipments_offline_meters em, tbl_offline_meters m "
@ -1630,10 +1630,10 @@ class CombinedEquipmentOfflineMeterCollection:
result = list() result = list()
if rows is not None and len(rows) > 0: if rows is not None and len(rows) > 0:
for row in rows: for row in rows:
energy_category = energy_category_dict.get(row['energy_category_id'], None) energy_category = energy_category_dict.get(row[3], None)
meta_result = {"id": row['id'], "name": row['name'], "uuid": row['uuid'], meta_result = {"id": row[0], "name": row[1], "uuid": row[2],
"energy_category": energy_category, "energy_category": energy_category,
"is_output": bool(row['is_output'])} "is_output": bool(row[4])}
result.append(meta_result) result.append(meta_result)
resp.text = json.dumps(result) resp.text = json.dumps(result)
@ -1790,7 +1790,7 @@ class CombinedEquipmentVirtualMeterCollection:
description='API.INVALID_COMBINED_EQUIPMENT_ID') description='API.INVALID_COMBINED_EQUIPMENT_ID')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor(dictionary=True) cursor = cnx.cursor()
cursor.execute(" SELECT name " cursor.execute(" SELECT name "
" FROM tbl_combined_equipments " " FROM tbl_combined_equipments "
@ -1809,9 +1809,9 @@ class CombinedEquipmentVirtualMeterCollection:
energy_category_dict = dict() energy_category_dict = dict()
if rows_energy_categories is not None and len(rows_energy_categories) > 0: if rows_energy_categories is not None and len(rows_energy_categories) > 0:
for row in rows_energy_categories: for row in rows_energy_categories:
energy_category_dict[row['id']] = {"id": row['id'], energy_category_dict[row[0]] = {"id": row[0],
"name": row['name'], "name": row[1],
"uuid": row['uuid']} "uuid": row[2]}
query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output " query = (" SELECT m.id, m.name, m.uuid, m.energy_category_id, em.is_output "
" FROM tbl_combined_equipments e, tbl_combined_equipments_virtual_meters em, tbl_virtual_meters m " " FROM tbl_combined_equipments e, tbl_combined_equipments_virtual_meters em, tbl_virtual_meters m "
@ -1823,10 +1823,10 @@ class CombinedEquipmentVirtualMeterCollection:
result = list() result = list()
if rows is not None and len(rows) > 0: if rows is not None and len(rows) > 0:
for row in rows: for row in rows:
energy_category = energy_category_dict.get(row['energy_category_id'], None) energy_category = energy_category_dict.get(row[3], None)
meta_result = {"id": row['id'], "name": row['name'], "uuid": row['uuid'], meta_result = {"id": row[0], "name": row[1], "uuid": row[2],
"energy_category": energy_category, "energy_category": energy_category,
"is_output": bool(row['is_output'])} "is_output": bool(row[4])}
result.append(meta_result) result.append(meta_result)
resp.text = json.dumps(result) resp.text = json.dumps(result)