From d4e4b7af3f18ddeb8c9af8d1250a50e4bb0a92e1 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 1 Jun 2021 16:38:48 +0800
Subject: [PATCH] changed equipent and combined equipment associated points
 name to parameters name in reports API

---
 myems-api/reports/combinedequipmentcost.py           | 2 +-
 myems-api/reports/combinedequipmentefficiency.py     | 2 +-
 myems-api/reports/combinedequipmentenergycategory.py | 2 +-
 myems-api/reports/combinedequipmentenergyitem.py     | 2 +-
 myems-api/reports/combinedequipmentincome.py         | 2 +-
 myems-api/reports/combinedequipmentload.py           | 2 +-
 myems-api/reports/combinedequipmentoutput.py         | 2 +-
 myems-api/reports/combinedequipmentsaving.py         | 2 +-
 myems-api/reports/combinedequipmentstatistics.py     | 2 +-
 myems-api/reports/equipmentcost.py                   | 2 +-
 myems-api/reports/equipmentefficiency.py             | 2 +-
 myems-api/reports/equipmentenergycategory.py         | 2 +-
 myems-api/reports/equipmentenergyitem.py             | 2 +-
 myems-api/reports/equipmentincome.py                 | 2 +-
 myems-api/reports/equipmentload.py                   | 2 +-
 myems-api/reports/equipmentoutput.py                 | 2 +-
 myems-api/reports/equipmentsaving.py                 | 2 +-
 myems-api/reports/equipmentstatistics.py             | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/myems-api/reports/combinedequipmentcost.py b/myems-api/reports/combinedequipmentcost.py
index 6be93b25..64dbf462 100644
--- a/myems-api/reports/combinedequipmentcost.py
+++ b/myems-api/reports/combinedequipmentcost.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentefficiency.py b/myems-api/reports/combinedequipmentefficiency.py
index e37c5d17..0772008f 100644
--- a/myems-api/reports/combinedequipmentefficiency.py
+++ b/myems-api/reports/combinedequipmentefficiency.py
@@ -169,7 +169,7 @@ class Reporting:
         # Step 3: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentenergycategory.py b/myems-api/reports/combinedequipmentenergycategory.py
index b018aa6b..e3793b05 100644
--- a/myems-api/reports/combinedequipmentenergycategory.py
+++ b/myems-api/reports/combinedequipmentenergycategory.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py
index 7c9c76a8..239bc7a4 100644
--- a/myems-api/reports/combinedequipmentenergyitem.py
+++ b/myems-api/reports/combinedequipmentenergyitem.py
@@ -230,7 +230,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentincome.py b/myems-api/reports/combinedequipmentincome.py
index 0455e2b5..ae6c629f 100644
--- a/myems-api/reports/combinedequipmentincome.py
+++ b/myems-api/reports/combinedequipmentincome.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentload.py b/myems-api/reports/combinedequipmentload.py
index 96287d53..e5d46d7c 100644
--- a/myems-api/reports/combinedequipmentload.py
+++ b/myems-api/reports/combinedequipmentload.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentoutput.py b/myems-api/reports/combinedequipmentoutput.py
index 29160269..f16d5316 100644
--- a/myems-api/reports/combinedequipmentoutput.py
+++ b/myems-api/reports/combinedequipmentoutput.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentsaving.py b/myems-api/reports/combinedequipmentsaving.py
index 5ccfe447..1eac1d8a 100644
--- a/myems-api/reports/combinedequipmentsaving.py
+++ b/myems-api/reports/combinedequipmentsaving.py
@@ -239,7 +239,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/combinedequipmentstatistics.py b/myems-api/reports/combinedequipmentstatistics.py
index 3b7ee8d4..3b07ce15 100644
--- a/myems-api/reports/combinedequipmentstatistics.py
+++ b/myems-api/reports/combinedequipmentstatistics.py
@@ -226,7 +226,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_combined_equipments e, tbl_combined_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.combined_equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentcost.py b/myems-api/reports/equipmentcost.py
index 3dea4973..7162ff30 100644
--- a/myems-api/reports/equipmentcost.py
+++ b/myems-api/reports/equipmentcost.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentefficiency.py b/myems-api/reports/equipmentefficiency.py
index e4794163..6fd438fa 100644
--- a/myems-api/reports/equipmentefficiency.py
+++ b/myems-api/reports/equipmentefficiency.py
@@ -159,7 +159,7 @@ class Reporting:
         # Step 3: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentenergycategory.py b/myems-api/reports/equipmentenergycategory.py
index fd490d3b..b7e7f01d 100644
--- a/myems-api/reports/equipmentenergycategory.py
+++ b/myems-api/reports/equipmentenergycategory.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentenergyitem.py b/myems-api/reports/equipmentenergyitem.py
index 20fb744c..825ec9e8 100644
--- a/myems-api/reports/equipmentenergyitem.py
+++ b/myems-api/reports/equipmentenergyitem.py
@@ -222,7 +222,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentincome.py b/myems-api/reports/equipmentincome.py
index 55ae0fff..6c8a09f4 100644
--- a/myems-api/reports/equipmentincome.py
+++ b/myems-api/reports/equipmentincome.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentload.py b/myems-api/reports/equipmentload.py
index 1674e4c3..c392f148 100644
--- a/myems-api/reports/equipmentload.py
+++ b/myems-api/reports/equipmentload.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentoutput.py b/myems-api/reports/equipmentoutput.py
index 92680c82..0489bc1a 100644
--- a/myems-api/reports/equipmentoutput.py
+++ b/myems-api/reports/equipmentoutput.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentsaving.py b/myems-api/reports/equipmentsaving.py
index 797e7794..bb3dd551 100644
--- a/myems-api/reports/equipmentsaving.py
+++ b/myems-api/reports/equipmentsaving.py
@@ -231,7 +231,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "
diff --git a/myems-api/reports/equipmentstatistics.py b/myems-api/reports/equipmentstatistics.py
index b4aff44d..f191ad41 100644
--- a/myems-api/reports/equipmentstatistics.py
+++ b/myems-api/reports/equipmentstatistics.py
@@ -218,7 +218,7 @@ class Reporting:
         # Step 4: query associated points
         ################################################################################################################
         point_list = list()
-        cursor_system.execute(" SELECT p.id, p.name, p.units, p.object_type  "
+        cursor_system.execute(" SELECT p.id, ep.name, p.units, p.object_type  "
                               " FROM tbl_equipments e, tbl_equipments_parameters ep, tbl_points p "
                               " WHERE e.id = %s AND e.id = ep.equipment_id AND ep.parameter_type = 'point' "
                               "       AND ep.point_id = p.id "