replaced TRUE/FALSE with 1/0 in SQL statements in myems-aggregation service
parent
e3737c2154
commit
c0fb3251c9
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Reference in New Issue