diff --git a/myems-api/app.py b/myems-api/app.py index 9c269659..b3c67c8b 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -1,5 +1,4 @@ import falcon -from falcon_cors import CORS from falcon_multipart.middleware import MultipartMiddleware from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \ costcenter, point, knowledgefile, meter, tariff, user, storetype, timezone, \ @@ -91,11 +90,8 @@ from reports import virtualmetercost # https://github.com/lwcolton/falcon-cors # https://github.com/yohanboniface/falcon-multipart -cors = CORS(allow_all_origins=True, - allow_credentials_all_origins=True, - allow_all_headers=True, - allow_all_methods=True) -api = falcon.API(middleware=[cors.middleware, MultipartMiddleware()]) + +api = falcon.App(middleware=[falcon.CORSMiddleware(), MultipartMiddleware()]) ######################################################################################################################## diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index 5ba29a9b..d2c3cb2c 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -56,7 +56,7 @@ class CombinedEquipmentCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -199,7 +199,7 @@ class CombinedEquipmentItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -560,7 +560,7 @@ class CombinedEquipmentEquipmentCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -818,7 +818,7 @@ class CombinedEquipmentParameterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1127,7 +1127,7 @@ class CombinedEquipmentParameterItem: "numerator_meter": numerator_meter, "denominator_meter": denominator_meter} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -1433,7 +1433,7 @@ class CombinedEquipmentMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1623,7 +1623,7 @@ class CombinedEquipmentOfflineMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1814,7 +1814,7 @@ class CombinedEquipmentVirtualMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/contact.py b/myems-api/core/contact.py index 1fd8cd01..2ddf5bcb 100644 --- a/myems-api/core/contact.py +++ b/myems-api/core/contact.py @@ -42,7 +42,7 @@ class ContactCollection: "description": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -155,7 +155,7 @@ class ContactItem: "email": row[3], "phone": row[4], "description": row[5]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index e13a49a8..be55fc8a 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -35,7 +35,7 @@ class CostCenterCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2], "external_id": row[3]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -130,7 +130,7 @@ class CostCenterItem: description='API.COST_CENTER_NOT_FOUND') result = {"id": row[0], "name": row[1], "uuid": row[2], "external_id": row[3]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -404,7 +404,7 @@ class CostCenterTariffCollection: "unit_of_price": row[4]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index 7c8f65d6..f9b8ce57 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -46,7 +46,7 @@ class CostFileCollection: "status": row[4]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -186,7 +186,7 @@ class CostFileItem: "uuid": row[2], "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "status": row[4]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -281,4 +281,4 @@ class CostFileRestore: except Exception as ex: raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR', description='API.FAILED_TO_RESTORE_COST_FILE') - resp.body = json.dumps('success') + resp.text = json.dumps('success') diff --git a/myems-api/core/datasource.py b/myems-api/core/datasource.py index 836bf888..58c37e2d 100644 --- a/myems-api/core/datasource.py +++ b/myems-api/core/datasource.py @@ -65,7 +65,7 @@ class DataSourceCollection: result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -220,7 +220,7 @@ class DataSourceItem: "last_seen_datetime": last_seen_datetime } - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -416,4 +416,4 @@ class DataSourcePointCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/core/distributioncircuit.py b/myems-api/core/distributioncircuit.py index d093766b..a630bfc8 100644 --- a/myems-api/core/distributioncircuit.py +++ b/myems-api/core/distributioncircuit.py @@ -57,7 +57,7 @@ class DistributionCircuitCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -227,7 +227,7 @@ class DistributionCircuitItem: "customers": row['customers'], "meters": row['meters']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -434,7 +434,7 @@ class DistributionCircuitPointCollection: "uuid": row['distribution_circuit_uuid']}} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py index deecd4c3..749ccb77 100644 --- a/myems-api/core/distributionsystem.py +++ b/myems-api/core/distributionsystem.py @@ -41,7 +41,7 @@ class DistributionSystemCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -141,7 +141,7 @@ class DistributionSystemItem: "svg": row['svg'], "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -290,4 +290,4 @@ class DistributionSystemDistributionCircuitCollection: "customers": row['customers'], "meters": row['meters']} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 580ff681..2f146580 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -85,7 +85,7 @@ class EmailMessageCollection: "status": row[8]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class EmailMessageItem: @@ -144,7 +144,7 @@ class EmailMessageItem: "scheduled_datetime": row[7].timestamp() * 1000 if isinstance(row[7], datetime) else None, "status": row[8]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/emailserver.py b/myems-api/core/emailserver.py index effc7f0d..c057e14f 100644 --- a/myems-api/core/emailserver.py +++ b/myems-api/core/emailserver.py @@ -42,7 +42,7 @@ class EmailServerCollection: "from_addr": row[6]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -174,7 +174,7 @@ class EmailServerItem: "password": str(base64.b64decode(bytearray(row[5], 'utf-8')), 'utf-8') if row[5] is not None else None, "from_addr": row[5]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/energycategory.py b/myems-api/core/energycategory.py index 7738a903..3aeb9b1c 100644 --- a/myems-api/core/energycategory.py +++ b/myems-api/core/energycategory.py @@ -36,7 +36,7 @@ class EnergyCategoryCollection: "kgce": row[4], "kgco2e": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -144,7 +144,7 @@ class EnergyCategoryItem: "unit_of_measure": row[3], "kgce": row[4], "kgco2e": row[5]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/energyflowdiagram.py b/myems-api/core/energyflowdiagram.py index e412f344..4e61e127 100644 --- a/myems-api/core/energyflowdiagram.py +++ b/myems-api/core/energyflowdiagram.py @@ -118,7 +118,7 @@ class EnergyFlowDiagramCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -280,7 +280,7 @@ class EnergyFlowDiagramItem: "links": link_list_dict.get(row['id'], None), } - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -471,7 +471,7 @@ class EnergyFlowDiagramLinkCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -715,7 +715,7 @@ class EnergyFlowDiagramLinkItem: "source_node": source_node, "target_node": target_node, "meter": meter} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -968,7 +968,7 @@ class EnergyFlowDiagramNodeCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1064,7 +1064,7 @@ class EnergyFlowDiagramNodeItem: meta_result = {"id": row['id'], "name": row['name']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger diff --git a/myems-api/core/energyitem.py b/myems-api/core/energyitem.py index a9a12a47..16585c00 100644 --- a/myems-api/core/energyitem.py +++ b/myems-api/core/energyitem.py @@ -49,7 +49,7 @@ class EnergyItemCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -160,7 +160,7 @@ class EnergyItemItem: "name": row['name'], "uuid": row['uuid'], "energy_category": energy_category} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index 0560d5b3..755d4be0 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -56,7 +56,7 @@ class EquipmentCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -199,7 +199,7 @@ class EquipmentItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -661,7 +661,7 @@ class EquipmentParameterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -971,7 +971,7 @@ class EquipmentParameterItem: "numerator_meter": numerator_meter, "denominator_meter": denominator_meter} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -1277,7 +1277,7 @@ class EquipmentMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1466,7 +1466,7 @@ class EquipmentOfflineMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1656,7 +1656,7 @@ class EquipmentVirtualMeterCollection: "is_output": bool(row['is_output'])} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/gateway.py b/myems-api/core/gateway.py index 8d380459..9257bd2c 100644 --- a/myems-api/core/gateway.py +++ b/myems-api/core/gateway.py @@ -49,7 +49,7 @@ class GatewayCollection: } result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -142,7 +142,7 @@ class GatewayItem: "token": row['token'], "last_seen_datetime": last_seen_datetime} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -298,5 +298,5 @@ class GatewayDataSourceCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/core/knowledgefile.py b/myems-api/core/knowledgefile.py index 029e27dc..c71b6cd7 100644 --- a/myems-api/core/knowledgefile.py +++ b/myems-api/core/knowledgefile.py @@ -70,7 +70,7 @@ class KnowledgeFileCollection: } result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -229,7 +229,7 @@ class KnowledgeFileItem: "uuid": row[2], "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "user_display_name": user_dict.get(row[4], None)} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -324,5 +324,5 @@ class KnowledgeFileRestore: except Exception as ex: raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR', description='API.FAILED_TO_RESTORE_KNOWLEDGE_FILE') - resp.body = json.dumps('success') + resp.text = json.dumps('success') diff --git a/myems-api/core/menu.py b/myems-api/core/menu.py index 7c029a12..143b2f6f 100644 --- a/myems-api/core/menu.py +++ b/myems-api/core/menu.py @@ -39,7 +39,7 @@ class MenuCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) class MenuItem: @@ -77,7 +77,7 @@ class MenuItem: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -184,7 +184,7 @@ class MenuChildrenCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) class MenuWebCollection: @@ -233,4 +233,4 @@ class MenuWebCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 8c792f69..1aa5b3fb 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -99,7 +99,7 @@ class MeterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -368,7 +368,7 @@ class MeterItem: "master_meter": master_meter, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -844,7 +844,7 @@ class MeterSubmeterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) class MeterPointCollection: @@ -892,7 +892,7 @@ class MeterPointCollection: "address": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/notification.py b/myems-api/core/notification.py index e0c36051..423e4e94 100644 --- a/myems-api/core/notification.py +++ b/myems-api/core/notification.py @@ -145,7 +145,7 @@ class NotificationCollection: "url": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class NotificationItem: @@ -241,7 +241,7 @@ class NotificationItem: "message": row[4], "url": row[5]} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 779dedaa..223851e9 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -85,7 +85,7 @@ class OfflineMeterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -313,7 +313,7 @@ class OfflineMeterItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger diff --git a/myems-api/core/offlinemeterfile.py b/myems-api/core/offlinemeterfile.py index c0a6dc0c..0f10b562 100644 --- a/myems-api/core/offlinemeterfile.py +++ b/myems-api/core/offlinemeterfile.py @@ -46,7 +46,7 @@ class OfflineMeterFileCollection: "status": row[4]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -189,7 +189,7 @@ class OfflineMeterFileItem: "uuid": row[2], "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "status": row[4]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -284,4 +284,4 @@ class OfflineMeterFileRestore: except Exception as ex: raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR', description='API.FAILED_TO_RESTORE_OFFLINE_METER_FILE') - resp.body = json.dumps('success') + resp.text = json.dumps('success') diff --git a/myems-api/core/point.py b/myems-api/core/point.py index d01a1348..b52accdf 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -58,7 +58,7 @@ class PointCollection: "description": row['description']} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -250,7 +250,7 @@ class PointItem: "is_virtual": bool(row['is_virtual']), "address": row['address'], "description": row['description']} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/privilege.py b/myems-api/core/privilege.py index 096a4815..e454cd02 100644 --- a/myems-api/core/privilege.py +++ b/myems-api/core/privilege.py @@ -36,7 +36,7 @@ class PrivilegeCollection: "data": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/rule.py b/myems-api/core/rule.py index 90796428..f096fec9 100644 --- a/myems-api/core/rule.py +++ b/myems-api/core/rule.py @@ -64,7 +64,7 @@ class RuleCollection: } result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -240,7 +240,7 @@ class RuleItem: "last_run_datetime": last_run_datetime, "next_run_datetime": next_run_datetime, } - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/sensor.py b/myems-api/core/sensor.py index 8bc4b428..808dd78a 100644 --- a/myems-api/core/sensor.py +++ b/myems-api/core/sensor.py @@ -38,7 +38,7 @@ class SensorCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -128,7 +128,7 @@ class SensorItem: "uuid": row['uuid'], "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -314,7 +314,7 @@ class SensorPointCollection: "address": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index b3616308..20c79dd9 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -82,7 +82,7 @@ class ShopfloorCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -274,7 +274,7 @@ class ShopfloorItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -560,7 +560,7 @@ class ShopfloorEquipmentCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -743,7 +743,7 @@ class ShopfloorMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -925,7 +925,7 @@ class ShopfloorOfflineMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1107,7 +1107,7 @@ class ShopfloorPointCollection: meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1276,7 +1276,7 @@ class ShopfloorSensorCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1458,7 +1458,7 @@ class ShopfloorVirtualMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/space.py b/myems-api/core/space.py index e3cd05a5..a4e7a218 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -102,7 +102,7 @@ class SpaceCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -356,7 +356,7 @@ class SpaceItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -813,7 +813,7 @@ class SpaceChildrenCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) class SpaceCombinedEquipmentCollection: @@ -857,7 +857,7 @@ class SpaceCombinedEquipmentCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1026,7 +1026,7 @@ class SpaceEquipmentCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1208,7 +1208,7 @@ class SpaceMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1392,7 +1392,7 @@ class SpaceOfflineMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1574,7 +1574,7 @@ class SpacePointCollection: meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1743,7 +1743,7 @@ class SpaceSensorCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1911,7 +1911,7 @@ class SpaceShopfloorCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -2079,7 +2079,7 @@ class SpaceStoreCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -2247,7 +2247,7 @@ class SpaceTenantCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -2429,7 +2429,7 @@ class SpaceVirtualMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -2666,4 +2666,4 @@ class SpaceTreeCollection: cursor.close() cnx.disconnect() - resp.body = JsonExporter(sort_keys=True).export(node_dict[space_id], ) + resp.text = JsonExporter(sort_keys=True).export(node_dict[space_id], ) diff --git a/myems-api/core/store.py b/myems-api/core/store.py index 7fa3c63c..dc7eae68 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -88,7 +88,7 @@ class StoreCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -330,7 +330,7 @@ class StoreItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -658,7 +658,7 @@ class StoreMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -840,7 +840,7 @@ class StoreOfflineMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1022,7 +1022,7 @@ class StorePointCollection: meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1191,7 +1191,7 @@ class StoreSensorCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1373,7 +1373,7 @@ class StoreVirtualMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/storetype.py b/myems-api/core/storetype.py index 675cb01e..64ca2113 100644 --- a/myems-api/core/storetype.py +++ b/myems-api/core/storetype.py @@ -36,7 +36,7 @@ class StoreTypeCollection: "description": row[3], "simplified_code": row[4]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -145,7 +145,7 @@ class StoreTypeItem: "uuid": row[2], "description": row[3], "simplified_code": row[4]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index e8e5a732..64b1d580 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -95,7 +95,7 @@ class TariffCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -306,7 +306,7 @@ class TariffItem: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/tenant.py b/myems-api/core/tenant.py index 0a82ee82..31389811 100644 --- a/myems-api/core/tenant.py +++ b/myems-api/core/tenant.py @@ -105,7 +105,7 @@ class TenantCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -397,7 +397,7 @@ class TenantItem: "cost_center": cost_center, "description": row['description']} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger @@ -761,7 +761,7 @@ class TenantMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -943,7 +943,7 @@ class TenantOfflineMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1125,7 +1125,7 @@ class TenantPointCollection: meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1294,7 +1294,7 @@ class TenantSensorCollection: meta_result = {"id": row[0], "name": row[1], "uuid": row[2]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -1476,7 +1476,7 @@ class TenantVirtualMeterCollection: "energy_category": energy_category} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/tenanttype.py b/myems-api/core/tenanttype.py index c7b63f87..761d566c 100644 --- a/myems-api/core/tenanttype.py +++ b/myems-api/core/tenanttype.py @@ -36,7 +36,7 @@ class TenantTypeCollection: "description": row[3], "simplified_code": row[4]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -145,7 +145,7 @@ class TenantTypeItem: "uuid": row[2], "description": row[3], "simplified_code": row[4]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/textmessage.py b/myems-api/core/textmessage.py index 12016b39..6c8d9822 100644 --- a/myems-api/core/textmessage.py +++ b/myems-api/core/textmessage.py @@ -82,7 +82,7 @@ class TextMessageCollection: "status": row[7]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class TextMessageItem: @@ -140,7 +140,7 @@ class TextMessageItem: "acknowledge_code": row[6], "status": row[7]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/timezone.py b/myems-api/core/timezone.py index a9f3551e..1dbb5356 100644 --- a/myems-api/core/timezone.py +++ b/myems-api/core/timezone.py @@ -33,7 +33,7 @@ class TimezoneCollection: meta_result = {"id": row[0], "name": row[1], "description": row[2], "utc_offset": row[3]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class TimezoneItem: @@ -71,7 +71,7 @@ class TimezoneItem: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/core/user.py b/myems-api/core/user.py index da3fd773..a51b7e70 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -63,7 +63,7 @@ class UserCollection: password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod def on_post(req, resp): @@ -244,7 +244,7 @@ class UserItem: "name": row[7]} if row[6] is not None else None, "account_expiration_datetime": account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "password_expiration_datetime": password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -545,7 +545,7 @@ class UserLogin: result['token'] = token - resp.body = json.dumps(result) + resp.text = json.dumps(result) resp.status = falcon.HTTP_200 write_log(user_uuid=user_uuid, request_method='PUT', resource_type='UserLogin', resource_id=None, request_body=None) @@ -592,7 +592,7 @@ class UserLogout: if rowcount is None or rowcount == 0: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', description='API.USER_SESSION_NOT_FOUND') - resp.body = json.dumps("OK") + resp.text = json.dumps("OK") resp.status = falcon.HTTP_200 @@ -707,7 +707,7 @@ class ChangePassword: cursor.close() cnx.disconnect() - resp.body = json.dumps("OK") + resp.text = json.dumps("OK") resp.status = falcon.HTTP_200 write_log(user_uuid=user_uuid, request_method='PUT', resource_type='ChangePassword', resource_id=None, request_body=None) @@ -823,7 +823,7 @@ class ResetPassword: cursor.close() cnx.disconnect() - resp.body = json.dumps("OK") + resp.text = json.dumps("OK") resp.status = falcon.HTTP_200 write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='ResetPassword', resource_id=user_id, request_body=None) diff --git a/myems-api/core/version.py b/myems-api/core/version.py index c262e344..fea7608c 100644 --- a/myems-api/core/version.py +++ b/myems-api/core/version.py @@ -18,5 +18,5 @@ class VersionItem: result = {"version": 'MyEMS v1.3.4', "release-date": '2021-11-06', "website": "https://myems.io"} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index a4cc5e66..effe4d5b 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -143,7 +143,7 @@ class VirtualMeterCollection: cursor.close() cnx.disconnect() - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger @@ -502,7 +502,7 @@ class VirtualMeterItem: cursor.close() cnx.disconnect() - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py index 4dd605ad..de481c79 100644 --- a/myems-api/core/webmessage.py +++ b/myems-api/core/webmessage.py @@ -95,7 +95,7 @@ class WebMessageCollection: "reply": row[6]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class WebMessageStatusNewCollection: @@ -159,7 +159,7 @@ class WebMessageStatusNewCollection: "status": row[5]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class WebMessageItem: @@ -227,7 +227,7 @@ class WebMessageItem: "status": row[5], "reply": row[6]} - resp.body = json.dumps(meta_result) + resp.text = json.dumps(meta_result) @staticmethod @user_logger diff --git a/myems-api/core/wechatmessage.py b/myems-api/core/wechatmessage.py index 4a6a4826..953cfcf4 100644 --- a/myems-api/core/wechatmessage.py +++ b/myems-api/core/wechatmessage.py @@ -73,7 +73,7 @@ class WechatMessageCollection(object): "acknowledge_code": row[7], "status": row[8]} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class WechatMessageItem: @@ -122,7 +122,7 @@ class WechatMessageItem: "acknowledge_code": row[7], "status": row[8]} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod @user_logger diff --git a/myems-api/reports/advancedreport.py b/myems-api/reports/advancedreport.py index 591c8749..60ea9ca6 100644 --- a/myems-api/reports/advancedreport.py +++ b/myems-api/reports/advancedreport.py @@ -105,7 +105,7 @@ class AdvancedReportCollection: "file_bytes_base64": base64_message} result.append(meta_result) - resp.body = json.dumps(result) + resp.text = json.dumps(result) class AdvancedReportItem: @@ -155,7 +155,7 @@ class AdvancedReportItem: row['create_datetime_utc'].replace(tzinfo=timezone.utc).timestamp() * 1000, "file_type": row['file_type'], "file_bytes_base64": base64_message} - resp.body = json.dumps(result) + resp.text = json.dumps(result) @staticmethod def on_delete(req, resp, id_): diff --git a/myems-api/reports/combinedequipmentbatch.py b/myems-api/reports/combinedequipmentbatch.py index c93531f8..38297582 100644 --- a/myems-api/reports/combinedequipmentbatch.py +++ b/myems-api/reports/combinedequipmentbatch.py @@ -239,4 +239,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentcost.py b/myems-api/reports/combinedequipmentcost.py index 7d6f74ac..7085f33a 100644 --- a/myems-api/reports/combinedequipmentcost.py +++ b/myems-api/reports/combinedequipmentcost.py @@ -596,4 +596,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentefficiency.py b/myems-api/reports/combinedequipmentefficiency.py index 49b2a832..92646576 100644 --- a/myems-api/reports/combinedequipmentefficiency.py +++ b/myems-api/reports/combinedequipmentefficiency.py @@ -801,4 +801,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentenergycategory.py b/myems-api/reports/combinedequipmentenergycategory.py index c06eb07e..cf2524b1 100644 --- a/myems-api/reports/combinedequipmentenergycategory.py +++ b/myems-api/reports/combinedequipmentenergycategory.py @@ -630,4 +630,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py index 1ce17c22..28049fe3 100644 --- a/myems-api/reports/combinedequipmentenergyitem.py +++ b/myems-api/reports/combinedequipmentenergyitem.py @@ -594,4 +594,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentincome.py b/myems-api/reports/combinedequipmentincome.py index d52133a4..4c89d1f5 100644 --- a/myems-api/reports/combinedequipmentincome.py +++ b/myems-api/reports/combinedequipmentincome.py @@ -570,4 +570,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentload.py b/myems-api/reports/combinedequipmentload.py index 16659100..17a0c065 100644 --- a/myems-api/reports/combinedequipmentload.py +++ b/myems-api/reports/combinedequipmentload.py @@ -622,4 +622,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentoutput.py b/myems-api/reports/combinedequipmentoutput.py index eb438d6a..593d9a43 100644 --- a/myems-api/reports/combinedequipmentoutput.py +++ b/myems-api/reports/combinedequipmentoutput.py @@ -559,4 +559,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentsaving.py b/myems-api/reports/combinedequipmentsaving.py index 52ab71c6..74ff007b 100644 --- a/myems-api/reports/combinedequipmentsaving.py +++ b/myems-api/reports/combinedequipmentsaving.py @@ -791,4 +791,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/combinedequipmentstatistics.py b/myems-api/reports/combinedequipmentstatistics.py index 3fd366ad..21e21468 100644 --- a/myems-api/reports/combinedequipmentstatistics.py +++ b/myems-api/reports/combinedequipmentstatistics.py @@ -640,4 +640,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/dashboard.py b/myems-api/reports/dashboard.py index f75fde71..64dbfaa8 100644 --- a/myems-api/reports/dashboard.py +++ b/myems-api/reports/dashboard.py @@ -824,4 +824,4 @@ class Reporting: result['child_space_cost']['subtotals_array'].append( child_space_cost[energy_category_id]['subtotals']) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/distributionsystem.py b/myems-api/reports/distributionsystem.py index d60db7f9..e5038619 100644 --- a/myems-api/reports/distributionsystem.py +++ b/myems-api/reports/distributionsystem.py @@ -160,4 +160,4 @@ class Reporting: result = circuit_list - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/energyflowdiagram.py b/myems-api/reports/energyflowdiagram.py index 4723d475..7fa18924 100644 --- a/myems-api/reports/energyflowdiagram.py +++ b/myems-api/reports/energyflowdiagram.py @@ -264,4 +264,4 @@ class Reporting: result['links'].append({'source': link['source_node']['name'], 'target': link['target_node']['name'], 'value': link['value']}) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentbatch.py b/myems-api/reports/equipmentbatch.py index 38c17e1d..116c703a 100644 --- a/myems-api/reports/equipmentbatch.py +++ b/myems-api/reports/equipmentbatch.py @@ -239,4 +239,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentcost.py b/myems-api/reports/equipmentcost.py index 2f606913..f4bf8b3b 100644 --- a/myems-api/reports/equipmentcost.py +++ b/myems-api/reports/equipmentcost.py @@ -523,4 +523,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentefficiency.py b/myems-api/reports/equipmentefficiency.py index 64baabd6..9e3836f8 100644 --- a/myems-api/reports/equipmentefficiency.py +++ b/myems-api/reports/equipmentefficiency.py @@ -667,4 +667,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentenergycategory.py b/myems-api/reports/equipmentenergycategory.py index 7f063db8..4aa5dbba 100644 --- a/myems-api/reports/equipmentenergycategory.py +++ b/myems-api/reports/equipmentenergycategory.py @@ -556,4 +556,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentenergyitem.py b/myems-api/reports/equipmentenergyitem.py index 1ba96618..34547528 100644 --- a/myems-api/reports/equipmentenergyitem.py +++ b/myems-api/reports/equipmentenergyitem.py @@ -527,4 +527,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentincome.py b/myems-api/reports/equipmentincome.py index d08fd615..ad5c0c42 100644 --- a/myems-api/reports/equipmentincome.py +++ b/myems-api/reports/equipmentincome.py @@ -500,4 +500,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentload.py b/myems-api/reports/equipmentload.py index 7c701228..058ff50f 100644 --- a/myems-api/reports/equipmentload.py +++ b/myems-api/reports/equipmentload.py @@ -537,4 +537,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentoutput.py b/myems-api/reports/equipmentoutput.py index e4a2fcfe..6469f97b 100644 --- a/myems-api/reports/equipmentoutput.py +++ b/myems-api/reports/equipmentoutput.py @@ -488,4 +488,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentsaving.py b/myems-api/reports/equipmentsaving.py index d8f8d1f6..8a31982f 100644 --- a/myems-api/reports/equipmentsaving.py +++ b/myems-api/reports/equipmentsaving.py @@ -678,4 +678,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmentstatistics.py b/myems-api/reports/equipmentstatistics.py index 830f7c5e..7e26edc7 100644 --- a/myems-api/reports/equipmentstatistics.py +++ b/myems-api/reports/equipmentstatistics.py @@ -571,4 +571,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/equipmenttracking.py b/myems-api/reports/equipmenttracking.py index c231857d..9f2fec30 100644 --- a/myems-api/reports/equipmenttracking.py +++ b/myems-api/reports/equipmenttracking.py @@ -111,4 +111,4 @@ class Reporting: result['excel_bytes_base64'] = \ excelexporters.equipmenttracking.export(result, space_name) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddcombinedequipmentfault.py b/myems-api/reports/fddcombinedequipmentfault.py index 65974313..85e96f07 100644 --- a/myems-api/reports/fddcombinedequipmentfault.py +++ b/myems-api/reports/fddcombinedequipmentfault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddequipmentfault.py b/myems-api/reports/fddequipmentfault.py index 65974313..85e96f07 100644 --- a/myems-api/reports/fddequipmentfault.py +++ b/myems-api/reports/fddequipmentfault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddshopfloorfault.py b/myems-api/reports/fddshopfloorfault.py index 65974313..85e96f07 100644 --- a/myems-api/reports/fddshopfloorfault.py +++ b/myems-api/reports/fddshopfloorfault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddspacefault.py b/myems-api/reports/fddspacefault.py index 65974313..85e96f07 100644 --- a/myems-api/reports/fddspacefault.py +++ b/myems-api/reports/fddspacefault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddstorefault.py b/myems-api/reports/fddstorefault.py index 9acc4faa..374f31c7 100644 --- a/myems-api/reports/fddstorefault.py +++ b/myems-api/reports/fddstorefault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/fddtenantfault.py b/myems-api/reports/fddtenantfault.py index 65974313..85e96f07 100644 --- a/myems-api/reports/fddtenantfault.py +++ b/myems-api/reports/fddtenantfault.py @@ -15,4 +15,4 @@ class Reporting: @staticmethod def on_get(req, resp): result = {} - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/meterbatch.py b/myems-api/reports/meterbatch.py index 53161df4..4bb46f1c 100644 --- a/myems-api/reports/meterbatch.py +++ b/myems-api/reports/meterbatch.py @@ -233,4 +233,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/metercost.py b/myems-api/reports/metercost.py index 318e51fa..74b1b2d8 100644 --- a/myems-api/reports/metercost.py +++ b/myems-api/reports/metercost.py @@ -479,4 +479,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/meterenergy.py b/myems-api/reports/meterenergy.py index 681beb7e..8ce183c2 100644 --- a/myems-api/reports/meterenergy.py +++ b/myems-api/reports/meterenergy.py @@ -415,4 +415,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/meterrealtime.py b/myems-api/reports/meterrealtime.py index 5f895354..e3827dba 100644 --- a/myems-api/reports/meterrealtime.py +++ b/myems-api/reports/meterrealtime.py @@ -204,4 +204,4 @@ class Reporting: } - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/metersubmetersbalance.py b/myems-api/reports/metersubmetersbalance.py index 944fefa9..df25161a 100644 --- a/myems-api/reports/metersubmetersbalance.py +++ b/myems-api/reports/metersubmetersbalance.py @@ -347,4 +347,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/metertracking.py b/myems-api/reports/metertracking.py index d45cf8d9..ba019379 100644 --- a/myems-api/reports/metertracking.py +++ b/myems-api/reports/metertracking.py @@ -224,4 +224,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/metertrend.py b/myems-api/reports/metertrend.py index 4ef8fc2d..f1870418 100644 --- a/myems-api/reports/metertrend.py +++ b/myems-api/reports/metertrend.py @@ -277,4 +277,4 @@ class Reporting: reporting_period_end_datetime_local, None) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/offlinemetercost.py b/myems-api/reports/offlinemetercost.py index 83c8fca8..95fe9ad5 100644 --- a/myems-api/reports/offlinemetercost.py +++ b/myems-api/reports/offlinemetercost.py @@ -388,4 +388,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/offlinemeterenergy.py b/myems-api/reports/offlinemeterenergy.py index d2b3dd26..ae89e53c 100644 --- a/myems-api/reports/offlinemeterenergy.py +++ b/myems-api/reports/offlinemeterenergy.py @@ -324,4 +324,4 @@ class Reporting: reporting_period_end_datetime, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorbatch.py b/myems-api/reports/shopfloorbatch.py index 080eb200..50de8f2a 100644 --- a/myems-api/reports/shopfloorbatch.py +++ b/myems-api/reports/shopfloorbatch.py @@ -238,4 +238,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorcost.py b/myems-api/reports/shopfloorcost.py index 77914495..39917c55 100644 --- a/myems-api/reports/shopfloorcost.py +++ b/myems-api/reports/shopfloorcost.py @@ -547,4 +547,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorenergycategory.py b/myems-api/reports/shopfloorenergycategory.py index 5043654f..296cccad 100644 --- a/myems-api/reports/shopfloorenergycategory.py +++ b/myems-api/reports/shopfloorenergycategory.py @@ -581,4 +581,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorenergyitem.py b/myems-api/reports/shopfloorenergyitem.py index 1a011f46..aeb59b84 100644 --- a/myems-api/reports/shopfloorenergyitem.py +++ b/myems-api/reports/shopfloorenergyitem.py @@ -544,4 +544,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorload.py b/myems-api/reports/shopfloorload.py index 591a1e94..4184d797 100644 --- a/myems-api/reports/shopfloorload.py +++ b/myems-api/reports/shopfloorload.py @@ -567,4 +567,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorsaving.py b/myems-api/reports/shopfloorsaving.py index 9ea673cf..93c589ab 100644 --- a/myems-api/reports/shopfloorsaving.py +++ b/myems-api/reports/shopfloorsaving.py @@ -704,4 +704,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/shopfloorstatistics.py b/myems-api/reports/shopfloorstatistics.py index 0fbd706d..8ef87f7c 100644 --- a/myems-api/reports/shopfloorstatistics.py +++ b/myems-api/reports/shopfloorstatistics.py @@ -630,4 +630,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spacecost.py b/myems-api/reports/spacecost.py index 1fcb9b52..e5f0db3a 100644 --- a/myems-api/reports/spacecost.py +++ b/myems-api/reports/spacecost.py @@ -605,4 +605,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceefficiency.py b/myems-api/reports/spaceefficiency.py index b3215c26..1783ad86 100644 --- a/myems-api/reports/spaceefficiency.py +++ b/myems-api/reports/spaceefficiency.py @@ -747,4 +747,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceenergycategory.py b/myems-api/reports/spaceenergycategory.py index b005436f..8484ad74 100644 --- a/myems-api/reports/spaceenergycategory.py +++ b/myems-api/reports/spaceenergycategory.py @@ -651,4 +651,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceenergyitem.py b/myems-api/reports/spaceenergyitem.py index 3762105f..e89b0cc2 100644 --- a/myems-api/reports/spaceenergyitem.py +++ b/myems-api/reports/spaceenergyitem.py @@ -603,4 +603,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceincome.py b/myems-api/reports/spaceincome.py index 87803b62..4c61715c 100644 --- a/myems-api/reports/spaceincome.py +++ b/myems-api/reports/spaceincome.py @@ -579,4 +579,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceload.py b/myems-api/reports/spaceload.py index bb0e8570..0d7811e6 100644 --- a/myems-api/reports/spaceload.py +++ b/myems-api/reports/spaceload.py @@ -567,4 +567,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spaceoutput.py b/myems-api/reports/spaceoutput.py index 39f95a03..629de36c 100644 --- a/myems-api/reports/spaceoutput.py +++ b/myems-api/reports/spaceoutput.py @@ -564,4 +564,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spacesaving.py b/myems-api/reports/spacesaving.py index c3a5bf0e..d11a213c 100644 --- a/myems-api/reports/spacesaving.py +++ b/myems-api/reports/spacesaving.py @@ -794,4 +794,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/spacestatistics.py b/myems-api/reports/spacestatistics.py index a615eaf7..1630be39 100644 --- a/myems-api/reports/spacestatistics.py +++ b/myems-api/reports/spacestatistics.py @@ -627,4 +627,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storebatch.py b/myems-api/reports/storebatch.py index d0368f24..e99a4ca2 100644 --- a/myems-api/reports/storebatch.py +++ b/myems-api/reports/storebatch.py @@ -237,4 +237,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storecost.py b/myems-api/reports/storecost.py index 04b17e96..045c499e 100644 --- a/myems-api/reports/storecost.py +++ b/myems-api/reports/storecost.py @@ -545,4 +545,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storeenergycategory.py b/myems-api/reports/storeenergycategory.py index 9326a0e9..a4cac711 100644 --- a/myems-api/reports/storeenergycategory.py +++ b/myems-api/reports/storeenergycategory.py @@ -580,4 +580,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storeenergyitem.py b/myems-api/reports/storeenergyitem.py index e8bded63..f0b7421a 100644 --- a/myems-api/reports/storeenergyitem.py +++ b/myems-api/reports/storeenergyitem.py @@ -544,4 +544,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storeload.py b/myems-api/reports/storeload.py index 364d7d20..e35f9bbb 100644 --- a/myems-api/reports/storeload.py +++ b/myems-api/reports/storeload.py @@ -568,4 +568,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storesaving.py b/myems-api/reports/storesaving.py index be1af2be..f6d801d8 100644 --- a/myems-api/reports/storesaving.py +++ b/myems-api/reports/storesaving.py @@ -699,4 +699,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/storestatistics.py b/myems-api/reports/storestatistics.py index 1ef536e5..648fd83f 100644 --- a/myems-api/reports/storestatistics.py +++ b/myems-api/reports/storestatistics.py @@ -628,4 +628,4 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantbatch.py b/myems-api/reports/tenantbatch.py index b2ca8635..0734a3c9 100644 --- a/myems-api/reports/tenantbatch.py +++ b/myems-api/reports/tenantbatch.py @@ -241,4 +241,4 @@ class Reporting: space_name, reporting_period_start_datetime_local, reporting_period_end_datetime_local) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantbill.py b/myems-api/reports/tenantbill.py index c5320de8..661e1363 100644 --- a/myems-api/reports/tenantbill.py +++ b/myems-api/reports/tenantbill.py @@ -355,4 +355,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantcost.py b/myems-api/reports/tenantcost.py index add30dad..6c4cc7c4 100644 --- a/myems-api/reports/tenantcost.py +++ b/myems-api/reports/tenantcost.py @@ -547,4 +547,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantenergycategory.py b/myems-api/reports/tenantenergycategory.py index 9c7858d0..346fcee4 100644 --- a/myems-api/reports/tenantenergycategory.py +++ b/myems-api/reports/tenantenergycategory.py @@ -581,4 +581,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantenergyitem.py b/myems-api/reports/tenantenergyitem.py index ea20590c..7b2b3937 100644 --- a/myems-api/reports/tenantenergyitem.py +++ b/myems-api/reports/tenantenergyitem.py @@ -544,4 +544,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantload.py b/myems-api/reports/tenantload.py index 1287714b..b64e646a 100644 --- a/myems-api/reports/tenantload.py +++ b/myems-api/reports/tenantload.py @@ -568,4 +568,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantsaving.py b/myems-api/reports/tenantsaving.py index d9ed4d88..8f184665 100644 --- a/myems-api/reports/tenantsaving.py +++ b/myems-api/reports/tenantsaving.py @@ -699,4 +699,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/tenantstatistics.py b/myems-api/reports/tenantstatistics.py index f4e38112..6a94a331 100644 --- a/myems-api/reports/tenantstatistics.py +++ b/myems-api/reports/tenantstatistics.py @@ -627,4 +627,4 @@ class Reporting: reporting_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/virtualmetercost.py b/myems-api/reports/virtualmetercost.py index e6eae2df..19f0bc71 100644 --- a/myems-api/reports/virtualmetercost.py +++ b/myems-api/reports/virtualmetercost.py @@ -387,4 +387,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result) diff --git a/myems-api/reports/virtualmeterenergy.py b/myems-api/reports/virtualmeterenergy.py index 962749c7..3b2e057a 100644 --- a/myems-api/reports/virtualmeterenergy.py +++ b/myems-api/reports/virtualmeterenergy.py @@ -327,4 +327,4 @@ class Reporting: reporting_period_end_datetime_local, period_type) - resp.body = json.dumps(result) + resp.text = json.dumps(result)