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

Merge branch 'develop'

pull/128/MERGE
13621160019@163.com 2022-02-23 22:18:19 +08:00
parent 6e27e1843a 8d17637cdd
commit cd6d6141d2
5 changed files with 132 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/demo-cn/myems_system_db.sql
View File

@ -80,7 +80,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -357,7 +357,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -616,7 +616,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_combined_equipments`
(`id`, `space_id`, `combined_equipment_id`)
VALUES
(1, 10000, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;
@ -629,7 +630,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_equipments`
(`id`, `space_id`, `equipment_id`)
VALUES
(1, 10000, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;

10
database/demo-de/myems_system_db.sql
View File

@ -80,7 +80,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -358,7 +358,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -620,7 +620,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_combined_equipments`
(`id`, `space_id`, `combined_equipment_id`)
VALUES
(1, 10000, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;
@ -633,7 +634,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_equipments`
(`id`, `space_id`, `equipment_id`)
VALUES
(1, 10000, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;

13
database/demo-en/myems_system_db.sql
View File

@ -80,7 +80,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -358,7 +358,7 @@ VALUES
(15, 1, 'inlet chilled water temperature', 'point', NULL, 2, NULL, NULL),
(16, 1, 'chilled_water instantaneous flow rate', 'point', NULL, 3, NULL, NULL),
(17, 1, 'instantaneous power', 'point', NULL, 4, NULL, NULL),
(18, 1, 'COP', 'fraction', NULL, NULL, 'a4e0dbf0-528a-4cbb-88cc-563527900d40', '89ff5118-d0c2-4dd8-8098-a8698189b2ea');
(18, 1, 'COP', 'fraction', NULL, NULL, '5ca47bc5-22c2-47fc-b906-33222191ea40', '719acf65-b932-4176-94e5-e9fe420abc68');
COMMIT;
@ -607,7 +607,8 @@ INSERT INTO `myems_system_db`.`tbl_spaces`
(`id`, `name`, `uuid`, `parent_space_id`, `area`, `timezone_id`, `contact_id`, `is_input_counted`, `is_output_counted`, `cost_center_id`, `description`)
VALUES
(2, 'MyEMS Building #1', '8f25b33b-db93-49b3-b0f8-b01e0c19df29', 1, 88888.888, 56, 1, true, true, 1, 'MyEMS Project'),
(3, 'MyEMS Building #2', '195d7ea8-17b4-4e9c-bb37-546428155438', 1, 66666.666, 56, 1, true, true, 1, 'MyEMS Project');
(3, 'MyEMS Building #2', '195d7ea8-17b4-4e9c-bb37-546428155438', 1, 66666.666, 56, 1, true, true, 1, 'MyEMS Project'),
(10000, 'Debugging Space', '2c44a292-eb0c-49a3-a50e-4fc03858dc0c', 1, 88888.888, 56, 1, true, true, 1, 'MyEMS Project');
COMMIT;
-- ---------------------------------------------------------------------------------------------------------------------
@ -619,7 +620,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_combined_equipments`
(`id`, `space_id`, `combined_equipment_id`)
VALUES
(1, 1, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;
@ -632,7 +634,8 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_spaces_equipments`
(`id`, `space_id`, `equipment_id`)
VALUES
(1, 1, 1);
(1, 10000, 1),
(2, 10000, 2);
COMMIT;

87
myems-api/reports/combinedequipmentefficiency.py
View File

@ -334,38 +334,63 @@ class Reporting:
virtual_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]}
if fraction_list is not None and len(fraction_list) > 0:
for fraction in fraction_list:
if fraction['numerator_meter_uuid'] in offline_meter_dict:
fraction['numerator_meter_id'] = offline_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_name'] = offline_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_unit'] = offline_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'offline_meter'
elif fraction['numerator_meter_uuid'] in virtual_meter_dict:
fraction['numerator_meter_id'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_name'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_unit'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'virtual_meter'
elif fraction['numerator_meter_uuid'] in meter_dict:
fraction['numerator_meter_id'] = meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_name'] = meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_unit'] = meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'meter'
for i in range(len(fraction_list)):
print(fraction_list[i])
if fraction_list[i]['numerator_meter_uuid'] in offline_meter_dict:
fraction_list[i]['numerator_meter_id'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'offline_meter'
elif fraction_list[i]['numerator_meter_uuid'] in virtual_meter_dict:
fraction_list[i]['numerator_meter_id'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'virtual_meter'
elif fraction_list[i]['numerator_meter_uuid'] in meter_dict:
fraction_list[i]['numerator_meter_id'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'meter'
else:
del fraction_list[i]
continue
if fraction['denominator_meter_uuid'] in offline_meter_dict:
fraction['denominator_meter_id'] = offline_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_name'] = offline_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_unit'] = offline_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'offline_meter'
elif fraction['denominator_meter_uuid'] in virtual_meter_dict:
fraction['denominator_meter_id'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_name'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_unit'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'virtual_meter'
elif fraction['denominator_meter_uuid'] in meter_dict:
fraction['denominator_meter_id'] = meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_name'] = meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_unit'] = meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'meter'
if fraction_list[i]['denominator_meter_uuid'] in offline_meter_dict:
fraction_list[i]['denominator_meter_id'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'offline_meter'
elif fraction_list[i]['denominator_meter_uuid'] in virtual_meter_dict:
fraction_list[i]['denominator_meter_id'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'virtual_meter'
elif fraction_list[i]['denominator_meter_uuid'] in meter_dict:
fraction_list[i]['denominator_meter_id'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'meter'
else:
del fraction_list[i]
continue
print(fraction_list)

87
myems-api/reports/equipmentefficiency.py
View File

@ -250,38 +250,63 @@ class Reporting:
virtual_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]}
if fraction_list is not None and len(fraction_list) > 0:
for fraction in fraction_list:
if fraction['numerator_meter_uuid'] in offline_meter_dict:
fraction['numerator_meter_name'] = offline_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = offline_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = offline_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'offline_meter'
elif fraction['numerator_meter_uuid'] in virtual_meter_dict:
fraction['numerator_meter_name'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'virtual_meter'
elif fraction['numerator_meter_uuid'] in meter_dict:
fraction['numerator_meter_name'] = meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'meter'
for i in range(len(fraction_list)):
print(fraction_list[i])
if fraction_list[i]['numerator_meter_uuid'] in offline_meter_dict:
fraction_list[i]['numerator_meter_id'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
offline_meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'offline_meter'
elif fraction_list[i]['numerator_meter_uuid'] in virtual_meter_dict:
fraction_list[i]['numerator_meter_id'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
virtual_meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'virtual_meter'
elif fraction_list[i]['numerator_meter_uuid'] in meter_dict:
fraction_list[i]['numerator_meter_id'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['id']
fraction_list[i]['numerator_meter_name'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['name']
fraction_list[i]['numerator_meter_unit'] = \
meter_dict[fraction_list[i]['numerator_meter_uuid']]['unit']
fraction_list[i]['numerator_meter_type'] = 'meter'
else:
del fraction_list[i]
continue
if fraction['denominator_meter_uuid'] in offline_meter_dict:
fraction['denominator_meter_name'] = offline_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = offline_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = offline_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'offline_meter'
elif fraction['denominator_meter_uuid'] in virtual_meter_dict:
fraction['denominator_meter_name'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'virtual_meter'
elif fraction['denominator_meter_uuid'] in meter_dict:
fraction['denominator_meter_name'] = meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'meter'
if fraction_list[i]['denominator_meter_uuid'] in offline_meter_dict:
fraction_list[i]['denominator_meter_id'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
offline_meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'offline_meter'
elif fraction_list[i]['denominator_meter_uuid'] in virtual_meter_dict:
fraction_list[i]['denominator_meter_id'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
virtual_meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'virtual_meter'
elif fraction_list[i]['denominator_meter_uuid'] in meter_dict:
fraction_list[i]['denominator_meter_id'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['id']
fraction_list[i]['denominator_meter_name'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['name']
fraction_list[i]['denominator_meter_unit'] = \
meter_dict[fraction_list[i]['denominator_meter_uuid']]['unit']
fraction_list[i]['denominator_meter_type'] = 'meter'
else:
del fraction_list[i]
continue
print(fraction_list)