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-03-24 16:36:52 +08:00
parent 5c4fddb30c c0fb3251c9
commit 4d12bd4a9d
19 changed files with 90 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
myems-aggregation/combined_equipment_energy_input_category.py
View File

@ -130,8 +130,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_combined_equipments_meters em " " FROM tbl_meters m, tbl_combined_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -161,8 +161,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -193,8 +193,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -225,7 +225,7 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_combined_equipments_equipments ce " " FROM tbl_equipments e, tbl_combined_equipments_equipments ce "
" WHERE e.id = ce.equipment_id " " WHERE e.id = ce.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND ce.combined_equipment_id = %s ", " AND ce.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()

14
myems-aggregation/combined_equipment_energy_input_item.py
View File

@ -130,9 +130,9 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_combined_equipments_meters em " " FROM tbl_meters m, tbl_combined_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -163,8 +163,8 @@ def worker(combined_equipment):
" FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -196,8 +196,8 @@ def worker(combined_equipment):
" FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -228,7 +228,7 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_combined_equipments_equipments ce " " FROM tbl_equipments e, tbl_combined_equipments_equipments ce "
" WHERE e.id = ce.equipment_id " " WHERE e.id = ce.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND ce.combined_equipment_id = %s ", " AND ce.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()

14
myems-aggregation/combined_equipment_energy_output_category.py
View File

@ -130,8 +130,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_combined_equipments_meters em " " FROM tbl_meters m, tbl_combined_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -161,8 +161,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_combined_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -193,8 +193,8 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_combined_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.combined_equipment_id = %s ", " AND em.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -225,7 +225,7 @@ def worker(combined_equipment):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_combined_equipments_equipments ce " " FROM tbl_equipments e, tbl_combined_equipments_equipments ce "
" WHERE e.id = ce.equipment_id " " WHERE e.id = ce.equipment_id "
" AND e.is_output_counted = true " " AND e.is_output_counted = 1 "
" AND ce.combined_equipment_id = %s ", " AND ce.combined_equipment_id = %s ",
(combined_equipment['id'],)) (combined_equipment['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()

12
myems-aggregation/equipment_energy_input_category.py
View File

@ -128,8 +128,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_equipments_meters em " " FROM tbl_meters m, tbl_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -159,8 +159,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -191,8 +191,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

12
myems-aggregation/equipment_energy_input_item.py
View File

@ -128,9 +128,9 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_equipments_meters em " " FROM tbl_meters m, tbl_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -161,8 +161,8 @@ def worker(equipment):
" FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -194,8 +194,8 @@ def worker(equipment):
" FROM tbl_offline_meters m, tbl_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = false " " AND em.is_output = 0 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

12
myems-aggregation/equipment_energy_output_category.py
View File

@ -128,8 +128,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_equipments_meters em " " FROM tbl_meters m, tbl_equipments_meters em "
" WHERE m.id = em.meter_id " " WHERE m.id = em.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -159,8 +159,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em " " FROM tbl_virtual_meters m, tbl_equipments_virtual_meters em "
" WHERE m.id = em.virtual_meter_id " " WHERE m.id = em.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -191,8 +191,8 @@ def worker(equipment):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_equipments_offline_meters em " " FROM tbl_offline_meters m, tbl_equipments_offline_meters em "
" WHERE m.id = em.offline_meter_id " " WHERE m.id = em.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND em.is_output = true " " AND em.is_output = 1 "
" AND em.equipment_id = %s ", " AND em.equipment_id = %s ",
(equipment['id'],)) (equipment['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

8
myems-aggregation/shopfloor_energy_input_category.py
View File

@ -130,7 +130,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_shopfloors_meters tm " " FROM tbl_meters m, tbl_shopfloors_meters tm "
" WHERE m.id = tm.meter_id " " WHERE m.id = tm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -160,7 +160,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_shopfloors_virtual_meters tm " " FROM tbl_virtual_meters m, tbl_shopfloors_virtual_meters tm "
" WHERE m.id = tm.virtual_meter_id " " WHERE m.id = tm.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -191,7 +191,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_shopfloors_offline_meters tm " " FROM tbl_offline_meters m, tbl_shopfloors_offline_meters tm "
" WHERE m.id = tm.offline_meter_id " " WHERE m.id = tm.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -222,7 +222,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_shopfloors_equipments se " " FROM tbl_equipments e, tbl_shopfloors_equipments se "
" WHERE e.id = se.equipment_id " " WHERE e.id = se.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.shopfloor_id = %s ", " AND se.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()

8
myems-aggregation/shopfloor_energy_input_item.py
View File

@ -130,7 +130,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_shopfloors_meters tm " " FROM tbl_meters m, tbl_shopfloors_meters tm "
" WHERE m.id = tm.meter_id " " WHERE m.id = tm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
@ -162,7 +162,7 @@ def worker(shopfloor):
" FROM tbl_virtual_meters m, tbl_shopfloors_virtual_meters tm " " FROM tbl_virtual_meters m, tbl_shopfloors_virtual_meters tm "
" WHERE m.id = tm.virtual_meter_id " " WHERE m.id = tm.virtual_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -194,7 +194,7 @@ def worker(shopfloor):
" FROM tbl_offline_meters m, tbl_shopfloors_offline_meters tm " " FROM tbl_offline_meters m, tbl_shopfloors_offline_meters tm "
" WHERE m.id = tm.offline_meter_id " " WHERE m.id = tm.offline_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.shopfloor_id = %s ", " AND tm.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -225,7 +225,7 @@ def worker(shopfloor):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_shopfloors_equipments se " " FROM tbl_equipments e, tbl_shopfloors_equipments se "
" WHERE e.id = se.equipment_id " " WHERE e.id = se.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.shopfloor_id = %s ", " AND se.shopfloor_id = %s ",
(shopfloor['id'],)) (shopfloor['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()

18
myems-aggregation/space_energy_input_category.py
View File

@ -140,7 +140,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_spaces_meters sm " " FROM tbl_meters m, tbl_spaces_meters sm "
" WHERE m.id = sm.meter_id " " WHERE m.id = sm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -170,7 +170,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_spaces_virtual_meters sm " " FROM tbl_virtual_meters m, tbl_spaces_virtual_meters sm "
" WHERE m.id = sm.virtual_meter_id " " WHERE m.id = sm.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -201,7 +201,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_spaces_offline_meters sm " " FROM tbl_offline_meters m, tbl_spaces_offline_meters sm "
" WHERE m.id = sm.offline_meter_id " " WHERE m.id = sm.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()
@ -232,7 +232,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se " " FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se "
" WHERE e.id = se.combined_equipment_id " " WHERE e.id = se.combined_equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_combined_equipments = cursor_system_db.fetchall() rows_combined_equipments = cursor_system_db.fetchall()
@ -262,7 +262,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_spaces_equipments se " " FROM tbl_equipments e, tbl_spaces_equipments se "
" WHERE e.id = se.equipment_id " " WHERE e.id = se.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()
@ -292,7 +292,7 @@ def worker(space):
cursor_system_db.execute(" SELECT s.id, s.name " cursor_system_db.execute(" SELECT s.id, s.name "
" FROM tbl_shopfloors s, tbl_spaces_shopfloors ss " " FROM tbl_shopfloors s, tbl_spaces_shopfloors ss "
" WHERE s.id = ss.shopfloor_id " " WHERE s.id = ss.shopfloor_id "
" AND s.is_input_counted = true " " AND s.is_input_counted = 1 "
" AND ss.space_id = %s ", " AND ss.space_id = %s ",
(space['id'],)) (space['id'],))
rows_shopfloors = cursor_system_db.fetchall() rows_shopfloors = cursor_system_db.fetchall()
@ -322,7 +322,7 @@ def worker(space):
cursor_system_db.execute(" SELECT s.id, s.name " cursor_system_db.execute(" SELECT s.id, s.name "
" FROM tbl_stores s, tbl_spaces_stores ss " " FROM tbl_stores s, tbl_spaces_stores ss "
" WHERE s.id = ss.store_id " " WHERE s.id = ss.store_id "
" AND s.is_input_counted = true " " AND s.is_input_counted = 1 "
" AND ss.space_id = %s ", " AND ss.space_id = %s ",
(space['id'],)) (space['id'],))
rows_stores = cursor_system_db.fetchall() rows_stores = cursor_system_db.fetchall()
@ -352,7 +352,7 @@ def worker(space):
cursor_system_db.execute(" SELECT t.id, t.name " cursor_system_db.execute(" SELECT t.id, t.name "
" FROM tbl_tenants t, tbl_spaces_tenants st " " FROM tbl_tenants t, tbl_spaces_tenants st "
" WHERE t.id = st.tenant_id " " WHERE t.id = st.tenant_id "
" AND t.is_input_counted = true " " AND t.is_input_counted = 1 "
" AND st.space_id = %s ", " AND st.space_id = %s ",
(space['id'],)) (space['id'],))
rows_tenants = cursor_system_db.fetchall() rows_tenants = cursor_system_db.fetchall()
@ -381,7 +381,7 @@ def worker(space):
try: try:
cursor_system_db.execute(" SELECT id, name " cursor_system_db.execute(" SELECT id, name "
" FROM tbl_spaces " " FROM tbl_spaces "
" WHERE is_input_counted = true " " WHERE is_input_counted = 1 "
" AND parent_space_id = %s ", " AND parent_space_id = %s ",
(space['id'],)) (space['id'],))
rows_child_spaces = cursor_system_db.fetchall() rows_child_spaces = cursor_system_db.fetchall()

18
myems-aggregation/space_energy_input_item.py
View File

@ -140,7 +140,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_spaces_meters sm " " FROM tbl_meters m, tbl_spaces_meters sm "
" WHERE m.id = sm.meter_id " " WHERE m.id = sm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
@ -171,7 +171,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_virtual_meters m, tbl_spaces_virtual_meters sm " " FROM tbl_virtual_meters m, tbl_spaces_virtual_meters sm "
" WHERE m.id = sm.virtual_meter_id " " WHERE m.id = sm.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
@ -203,7 +203,7 @@ def worker(space):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_offline_meters m, tbl_spaces_offline_meters sm " " FROM tbl_offline_meters m, tbl_spaces_offline_meters sm "
" WHERE m.id = sm.offline_meter_id " " WHERE m.id = sm.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND sm.space_id = %s ", " AND sm.space_id = %s ",
(space['id'],)) (space['id'],))
@ -235,7 +235,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se " " FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se "
" WHERE e.id = se.combined_equipment_id " " WHERE e.id = se.combined_equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_combined_equipments = cursor_system_db.fetchall() rows_combined_equipments = cursor_system_db.fetchall()
@ -265,7 +265,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_spaces_equipments se " " FROM tbl_equipments e, tbl_spaces_equipments se "
" WHERE e.id = se.equipment_id " " WHERE e.id = se.equipment_id "
" AND e.is_input_counted = true " " AND e.is_input_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()
@ -295,7 +295,7 @@ def worker(space):
cursor_system_db.execute(" SELECT s.id, s.name " cursor_system_db.execute(" SELECT s.id, s.name "
" FROM tbl_shopfloors s, tbl_spaces_shopfloors ss " " FROM tbl_shopfloors s, tbl_spaces_shopfloors ss "
" WHERE s.id = ss.shopfloor_id " " WHERE s.id = ss.shopfloor_id "
" AND s.is_input_counted = true " " AND s.is_input_counted = 1 "
" AND ss.space_id = %s ", " AND ss.space_id = %s ",
(space['id'],)) (space['id'],))
rows_shopfloors = cursor_system_db.fetchall() rows_shopfloors = cursor_system_db.fetchall()
@ -325,7 +325,7 @@ def worker(space):
cursor_system_db.execute(" SELECT s.id, s.name " cursor_system_db.execute(" SELECT s.id, s.name "
" FROM tbl_stores s, tbl_spaces_stores ss " " FROM tbl_stores s, tbl_spaces_stores ss "
" WHERE s.id = ss.store_id " " WHERE s.id = ss.store_id "
" AND s.is_input_counted = true " " AND s.is_input_counted = 1 "
" AND ss.space_id = %s ", " AND ss.space_id = %s ",
(space['id'],)) (space['id'],))
rows_stores = cursor_system_db.fetchall() rows_stores = cursor_system_db.fetchall()
@ -355,7 +355,7 @@ def worker(space):
cursor_system_db.execute(" SELECT t.id, t.name " cursor_system_db.execute(" SELECT t.id, t.name "
" FROM tbl_tenants t, tbl_spaces_tenants st " " FROM tbl_tenants t, tbl_spaces_tenants st "
" WHERE t.id = st.tenant_id " " WHERE t.id = st.tenant_id "
" AND t.is_input_counted = true " " AND t.is_input_counted = 1 "
" AND st.space_id = %s ", " AND st.space_id = %s ",
(space['id'],)) (space['id'],))
rows_tenants = cursor_system_db.fetchall() rows_tenants = cursor_system_db.fetchall()
@ -384,7 +384,7 @@ def worker(space):
try: try:
cursor_system_db.execute(" SELECT id, name " cursor_system_db.execute(" SELECT id, name "
" FROM tbl_spaces " " FROM tbl_spaces "
" WHERE is_input_counted = true " " WHERE is_input_counted = 1 "
" AND parent_space_id = %s ", " AND parent_space_id = %s ",
(space['id'],)) (space['id'],))
rows_child_spaces = cursor_system_db.fetchall() rows_child_spaces = cursor_system_db.fetchall()

6
myems-aggregation/space_energy_output_category.py
View File

@ -129,7 +129,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se " " FROM tbl_combined_equipments e, tbl_spaces_combined_equipments se "
" WHERE e.id = se.combined_equipment_id " " WHERE e.id = se.combined_equipment_id "
" AND e.is_output_counted = true " " AND e.is_output_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_combined_equipments = cursor_system_db.fetchall() rows_combined_equipments = cursor_system_db.fetchall()
@ -158,7 +158,7 @@ def worker(space):
cursor_system_db.execute(" SELECT e.id, e.name " cursor_system_db.execute(" SELECT e.id, e.name "
" FROM tbl_equipments e, tbl_spaces_equipments se " " FROM tbl_equipments e, tbl_spaces_equipments se "
" WHERE e.id = se.equipment_id " " WHERE e.id = se.equipment_id "
" AND e.is_output_counted = true " " AND e.is_output_counted = 1 "
" AND se.space_id = %s ", " AND se.space_id = %s ",
(space['id'],)) (space['id'],))
rows_equipments = cursor_system_db.fetchall() rows_equipments = cursor_system_db.fetchall()
@ -186,7 +186,7 @@ def worker(space):
try: try:
cursor_system_db.execute(" SELECT id, name " cursor_system_db.execute(" SELECT id, name "
" FROM tbl_spaces " " FROM tbl_spaces "
" WHERE is_output_counted = true " " WHERE is_output_counted = 1 "
" AND parent_space_id = %s ", " AND parent_space_id = %s ",
(space['id'],)) (space['id'],))
rows_child_spaces = cursor_system_db.fetchall() rows_child_spaces = cursor_system_db.fetchall()

6
myems-aggregation/store_energy_input_category.py
View File

@ -128,7 +128,7 @@ def worker(store):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_stores_meters sm " " FROM tbl_meters m, tbl_stores_meters sm "
" WHERE m.id = sm.meter_id " " WHERE m.id = sm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -158,7 +158,7 @@ def worker(store):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_stores_virtual_meters sm " " FROM tbl_virtual_meters m, tbl_stores_virtual_meters sm "
" WHERE m.id = sm.virtual_meter_id " " WHERE m.id = sm.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -189,7 +189,7 @@ def worker(store):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_stores_offline_meters sm " " FROM tbl_offline_meters m, tbl_stores_offline_meters sm "
" WHERE m.id = sm.offline_meter_id " " WHERE m.id = sm.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

6
myems-aggregation/store_energy_input_item.py
View File

@ -128,7 +128,7 @@ def worker(store):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_stores_meters sm " " FROM tbl_meters m, tbl_stores_meters sm "
" WHERE m.id = sm.meter_id " " WHERE m.id = sm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
@ -160,7 +160,7 @@ def worker(store):
" FROM tbl_virtual_meters m, tbl_stores_virtual_meters sm " " FROM tbl_virtual_meters m, tbl_stores_virtual_meters sm "
" WHERE m.id = sm.virtual_meter_id " " WHERE m.id = sm.virtual_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -192,7 +192,7 @@ def worker(store):
" FROM tbl_offline_meters m, tbl_stores_offline_meters sm " " FROM tbl_offline_meters m, tbl_stores_offline_meters sm "
" WHERE m.id = sm.offline_meter_id " " WHERE m.id = sm.offline_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND sm.store_id = %s ", " AND sm.store_id = %s ",
(store['id'],)) (store['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

6
myems-aggregation/tenant_energy_input_category.py
View File

@ -128,7 +128,7 @@ def worker(tenant):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_meters m, tbl_tenants_meters tm " " FROM tbl_meters m, tbl_tenants_meters tm "
" WHERE m.id = tm.meter_id " " WHERE m.id = tm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
rows_meters = cursor_system_db.fetchall() rows_meters = cursor_system_db.fetchall()
@ -158,7 +158,7 @@ def worker(tenant):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_virtual_meters m, tbl_tenants_virtual_meters tm " " FROM tbl_virtual_meters m, tbl_tenants_virtual_meters tm "
" WHERE m.id = tm.virtual_meter_id " " WHERE m.id = tm.virtual_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -189,7 +189,7 @@ def worker(tenant):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_category_id "
" FROM tbl_offline_meters m, tbl_tenants_offline_meters tm " " FROM tbl_offline_meters m, tbl_tenants_offline_meters tm "
" WHERE m.id = tm.offline_meter_id " " WHERE m.id = tm.offline_meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

6
myems-aggregation/tenant_energy_input_item.py
View File

@ -128,7 +128,7 @@ def worker(tenant):
cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id " cursor_system_db.execute(" SELECT m.id, m.name, m.energy_item_id "
" FROM tbl_meters m, tbl_tenants_meters tm " " FROM tbl_meters m, tbl_tenants_meters tm "
" WHERE m.id = tm.meter_id " " WHERE m.id = tm.meter_id "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
@ -160,7 +160,7 @@ def worker(tenant):
" FROM tbl_virtual_meters m, tbl_tenants_virtual_meters tm " " FROM tbl_virtual_meters m, tbl_tenants_virtual_meters tm "
" WHERE m.id = tm.virtual_meter_id " " WHERE m.id = tm.virtual_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
rows_virtual_meters = cursor_system_db.fetchall() rows_virtual_meters = cursor_system_db.fetchall()
@ -192,7 +192,7 @@ def worker(tenant):
" FROM tbl_offline_meters m, tbl_tenants_offline_meters tm " " FROM tbl_offline_meters m, tbl_tenants_offline_meters tm "
" WHERE m.id = tm.offline_meter_id " " WHERE m.id = tm.offline_meter_id "
" AND m.energy_item_id is NOT NULL " " AND m.energy_item_id is NOT NULL "
" AND m.is_counted = true " " AND m.is_counted = 1 "
" AND tm.tenant_id = %s ", " AND tm.tenant_id = %s ",
(tenant['id'],)) (tenant['id'],))
rows_offline_meters = cursor_system_db.fetchall() rows_offline_meters = cursor_system_db.fetchall()

14
myems-cleaning/clean_energy_value.py
View File

@ -33,8 +33,8 @@ def process(logger):
# Note: # Note:
# the default value of unchecked values' is_bad property is NULL # the default value of unchecked values' is_bad property is NULL
# if a value is checked and the result is bad then is_bad would be set to TRUE # if a value is checked and the result is bad then is_bad would be set to 1
# else if a value is checked and the result is good then is_bad would be set to FALSE # else if a value is checked and the result is good then is_bad would be set to 0
################################################################################################################ ################################################################################################################
# Step 1: get the time slot to clean. # Step 1: get the time slot to clean.
@ -212,7 +212,7 @@ def process(logger):
try: try:
query = (" SELECT id, point_id, actual_value " query = (" SELECT id, point_id, actual_value "
" FROM tbl_energy_value " " FROM tbl_energy_value "
" WHERE utc_date_time >= %s AND utc_date_time <= %s AND is_bad IS NOT TRUE ") " WHERE utc_date_time >= %s AND utc_date_time <= %s AND (is_bad = 0 OR is_bad IS NULL) ")
cursor_historical.execute(query, (min_datetime, max_datetime,)) cursor_historical.execute(query, (min_datetime, max_datetime,))
rows_energy_values = cursor_historical.fetchall() rows_energy_values = cursor_historical.fetchall()
except Exception as e: except Exception as e:
@ -239,7 +239,7 @@ def process(logger):
if len(bad_list) > 0: if len(bad_list) > 0:
try: try:
update = (" UPDATE tbl_energy_value " update = (" UPDATE tbl_energy_value "
" SET is_bad = TRUE " " SET is_bad = 1 "
" WHERE id IN (" + ', '.join(map(str, bad_list)) + ")") " WHERE id IN (" + ', '.join(map(str, bad_list)) + ")")
cursor_historical.execute(update, ) cursor_historical.execute(update, )
cnx_historical.commit() cnx_historical.commit()
@ -393,7 +393,7 @@ def process(logger):
try: try:
query = (" SELECT point_id, id, utc_date_time, actual_value " query = (" SELECT point_id, id, utc_date_time, actual_value "
" FROM tbl_energy_value " " FROM tbl_energy_value "
" WHERE utc_date_time >= %s AND utc_date_time <= %s AND is_bad IS NOT TRUE " " WHERE utc_date_time >= %s AND utc_date_time <= %s AND (is_bad = 0 OR is_bad IS NULL) "
" ORDER BY point_id, utc_date_time ") " ORDER BY point_id, utc_date_time ")
cursor_historical.execute(query, (min_datetime, max_datetime,)) cursor_historical.execute(query, (min_datetime, max_datetime,))
rows_energy_values = cursor_historical.fetchall() rows_energy_values = cursor_historical.fetchall()
@ -463,7 +463,7 @@ def process(logger):
if len(bad_list) > 0: if len(bad_list) > 0:
try: try:
update = (" UPDATE tbl_energy_value " update = (" UPDATE tbl_energy_value "
" SET is_bad = TRUE " " SET is_bad = 1 "
" WHERE id IN (" + ', '.join(map(str, bad_list)) + ")") " WHERE id IN (" + ', '.join(map(str, bad_list)) + ")")
cursor_historical.execute(update, ) cursor_historical.execute(update, )
cnx_historical.commit() cnx_historical.commit()
@ -557,7 +557,7 @@ def process(logger):
################################################################################################################ ################################################################################################################
try: try:
update = (" UPDATE tbl_energy_value " update = (" UPDATE tbl_energy_value "
" SET is_bad = FALSE " " SET is_bad = 0 "
" WHERE utc_date_time >= %s AND utc_date_time < %s AND is_bad IS NULL ") " WHERE utc_date_time >= %s AND utc_date_time < %s AND is_bad IS NULL ")
# NOTE: use '<' instead of '<=' in WHERE statement because there may be some new inserted values # NOTE: use '<' instead of '<=' in WHERE statement because there may be some new inserted values
cursor_historical.execute(update, (min_datetime, max_datetime,)) cursor_historical.execute(update, (min_datetime, max_datetime,))

7
myems-normalization/example.env
View File

@ -19,13 +19,6 @@ MYEMS_ENERGY_DB_DATABASE=myems_energy_db
MYEMS_ENERGY_DB_USER=root MYEMS_ENERGY_DB_USER=root
MYEMS_ENERGY_DB_PASSWORD=!MyEMS1 MYEMS_ENERGY_DB_PASSWORD=!MyEMS1
# config for myems_billing_db
MYEMS_BILLING_DB_HOST=127.0.0.1
MYEMS_BILLING_DB_PORT=3306
MYEMS_BILLING_DB_DATABASE=myems_billing_db
MYEMS_BILLING_DB_USER=root
MYEMS_BILLING_DB_PASSWORD=!MyEMS1
# indicates in how many minutes to normalize energy consumption # indicates in how many minutes to normalize energy consumption
# 30 for half hourly # 30 for half hourly
# 60 for hourly # 60 for hourly

4
myems-normalization/meter.py
View File

@ -207,7 +207,7 @@ def worker(meter):
try: try:
query = (" SELECT utc_date_time, actual_value " query = (" SELECT utc_date_time, actual_value "
" FROM tbl_energy_value " " FROM tbl_energy_value "
" WHERE point_id = %s AND utc_date_time < %s AND is_bad = FALSE " " WHERE point_id = %s AND utc_date_time < %s AND is_bad = 0 "
" ORDER BY utc_date_time DESC " " ORDER BY utc_date_time DESC "
" LIMIT 1 ") " LIMIT 1 ")
cursor_historical_db.execute(query, (meter['point_id'], start_datetime_utc,)) cursor_historical_db.execute(query, (meter['point_id'], start_datetime_utc,))
@ -235,7 +235,7 @@ def worker(meter):
try: try:
query = (" SELECT utc_date_time, actual_value " query = (" SELECT utc_date_time, actual_value "
" FROM tbl_energy_value " " FROM tbl_energy_value "
" WHERE point_id = %s AND utc_date_time >= %s AND utc_date_time < %s AND is_bad = FALSE " " WHERE point_id = %s AND utc_date_time >= %s AND utc_date_time < %s AND is_bad = 0 "
" ORDER BY utc_date_time ") " ORDER BY utc_date_time ")
cursor_historical_db.execute(query, (meter['point_id'], start_datetime_utc, end_datetime_utc)) cursor_historical_db.execute(query, (meter['point_id'], start_datetime_utc, end_datetime_utc))
rows_energy_values = cursor_historical_db.fetchall() rows_energy_values = cursor_historical_db.fetchall()

2
myems-normalization/virtualpoint.py
View File

@ -39,7 +39,7 @@ def calculate(logger):
try: try:
cursor_system_db.execute(" SELECT id, name, data_source_id, high_limit, low_limit, address " cursor_system_db.execute(" SELECT id, name, data_source_id, high_limit, low_limit, address "
" FROM tbl_points " " FROM tbl_points "
" WHERE is_virtual = TRUE AND object_type = 'ANALOG_VALUE' ") " WHERE is_virtual = 1 AND object_type = 'ANALOG_VALUE' ")
rows_virtual_points = cursor_system_db.fetchall() rows_virtual_points = cursor_system_db.fetchall()
if rows_virtual_points is None or len(rows_virtual_points) == 0: if rows_virtual_points is None or len(rows_virtual_points) == 0: