From fa3ff324cc33f2ae5b8efee001b25d5027fd713a Mon Sep 17 00:00:00 2001 From: nengyuanzhang <13011132526@163.com> Date: Sun, 11 Feb 2024 08:56:35 +0800 Subject: [PATCH] fixed warnings in myems-api --- myems-api/core/combinedequipment.py | 2 +- myems-api/core/command.py | 2 +- myems-api/core/distributionsystem.py | 2 +- myems-api/core/energystoragepowerstation.py | 2 +- myems-api/core/equipment.py | 2 +- myems-api/core/meter.py | 8 +++++--- myems-api/core/microgrid.py | 2 +- myems-api/core/offlinemeter.py | 2 +- myems-api/core/photovoltaicpowerstation.py | 2 +- myems-api/core/point.py | 2 +- myems-api/core/shopfloor.py | 2 +- myems-api/core/space.py | 14 +++++--------- myems-api/core/store.py | 2 +- myems-api/core/virtualmeter.py | 2 +- myems-api/core/virtualpowerplant.py | 2 +- myems-api/core/windfarm.py | 2 +- myems-api/core/workingcalendar.py | 2 +- .../reports/energystoragepowerstationdetails.py | 3 +-- .../reports/energystoragepowerstationreporting.py | 3 +-- myems-api/reports/offlinemeterinput.py | 6 +++--- 20 files changed, 30 insertions(+), 34 deletions(-) diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index ae2c10ecc5..412d60f897 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/command.py b/myems-api/core/command.py index f55d8a8e1e..bfdfcd8f0a 100644 --- a/myems-api/core/command.py +++ b/myems-api/core/command.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py index fbcee8b1a6..b840c91fe3 100644 --- a/myems-api/core/distributionsystem.py +++ b/myems-api/core/distributionsystem.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/energystoragepowerstation.py b/myems-api/core/energystoragepowerstation.py index b376ce3577..5a1e76e734 100644 --- a/myems-api/core/energystoragepowerstation.py +++ b/myems-api/core/energystoragepowerstation.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index b5212d11db..e054a2391b 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 352144009d..bcf98d74dd 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json @@ -1663,7 +1663,8 @@ def on_post(req, resp): cursor.close() cnx.close() raise falcon.HTTPError(status=falcon.HTTP_400, title='API.ERROR', - description='API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS') + description= + 'API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS') query = (" SELECT id " " FROM tbl_meters_points " @@ -1809,7 +1810,8 @@ def on_post(req, resp, id_): cursor.close() cnx.close() raise falcon.HTTPError(status=falcon.HTTP_400, title='API.ERROR', - description='API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS') + description= + 'API.METER_CANNOT_HAVE_MORE_THAN_ONE_ENERGY_VALUE_POINTS') query = (" SELECT id " " FROM tbl_meters_points " diff --git a/myems-api/core/microgrid.py b/myems-api/core/microgrid.py index 5d5da66473..0d4a564c8d 100644 --- a/myems-api/core/microgrid.py +++ b/myems-api/core/microgrid.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 64e62489fd..d25cc34b55 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/photovoltaicpowerstation.py b/myems-api/core/photovoltaicpowerstation.py index edb502d887..86802e9ec7 100644 --- a/myems-api/core/photovoltaicpowerstation.py +++ b/myems-api/core/photovoltaicpowerstation.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/point.py b/myems-api/core/point.py index 765ccb80e0..52ce077f4a 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -1,5 +1,5 @@ import falcon -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import mysql.connector import simplejson as json from core.useractivity import user_logger, admin_control diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index e4bca4d3cf..b98e86fe4e 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/space.py b/myems-api/core/space.py index 2f94a1309e..3023b08fb0 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json @@ -89,7 +89,6 @@ def on_get(req, resp): result = list() if rows_spaces is not None and len(rows_spaces) > 0: for row in rows_spaces: - timezone = timezone_dict.get(row[5], None) contact = contact_dict.get(row[8], None) cost_center = cost_center_dict.get(row[9], None) parent_space = space_dict.get(row[3], None) @@ -98,7 +97,7 @@ def on_get(req, resp): "uuid": row[2], "parent_space": parent_space, "area": row[4], - "timezone": timezone, + "timezone": timezone_dict.get(row[5], None), "is_input_counted": bool(row[6]), "is_output_counted": bool(row[7]), "contact": contact, @@ -383,7 +382,6 @@ def on_get(req, resp, id_): description='API.SPACE_NOT_FOUND') else: parent_space = space_dict.get(row[3], None) - timezone = timezone_dict.get(row[5], None) contact = contact_dict.get(row[8], None) cost_center = cost_center_dict.get(row[9], None) meta_result = {"id": row[0], @@ -391,7 +389,7 @@ def on_get(req, resp, id_): "uuid": row[2], "parent_space_id": parent_space, "area": row[4], - "timezone": timezone, + "timezone": timezone_dict.get(row[5], None), "is_input_counted": bool(row[6]), "is_output_counted": bool(row[7]), "contact": contact, @@ -804,7 +802,6 @@ def on_get(req, resp, id_): if rows_spaces is not None and len(rows_spaces) > 0: for row in rows_spaces: - timezone = timezone_dict.get(row[5], None) contact = contact_dict.get(row[8], None) cost_center = cost_center_dict.get(row[9], None) parent_space = space_dict.get(row[3], None) @@ -813,7 +810,7 @@ def on_get(req, resp, id_): "uuid": row[2], "parent_space": parent_space, "area": row[4], - "timezone": timezone, + "timezone": timezone_dict.get(row[5], None), "is_input_counted": bool(row[6]), "is_output_counted": bool(row[7]), "contact": contact, @@ -3589,7 +3586,6 @@ def on_post(req, resp, id_): description='API.SPACE_NOT_FOUND') else: parent_space = space_dict.get(row[3], None) - timezone = timezone_dict.get(row[5], None) contact = contact_dict.get(row[8], None) cost_center = cost_center_dict.get(row[9], None) meta_result = {"id": row[0], @@ -3597,7 +3593,7 @@ def on_post(req, resp, id_): "uuid": row[2], "parent_space_id": parent_space, "area": row[4], - "timezone": timezone, + "timezone": timezone_dict.get(row[5], None), "is_input_counted": bool(row[6]), "is_output_counted": bool(row[7]), "contact": contact, diff --git a/myems-api/core/store.py b/myems-api/core/store.py index 142aa1889e..8fb6aa52c3 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index dd85bc2fb6..98fc2b9f84 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/virtualpowerplant.py b/myems-api/core/virtualpowerplant.py index 5f7995c8ca..50d4c04fdc 100644 --- a/myems-api/core/virtualpowerplant.py +++ b/myems-api/core/virtualpowerplant.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/windfarm.py b/myems-api/core/windfarm.py index 1755f142f3..488d5c3421 100644 --- a/myems-api/core/windfarm.py +++ b/myems-api/core/windfarm.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/core/workingcalendar.py b/myems-api/core/workingcalendar.py index d1bb5920aa..242a3f0536 100644 --- a/myems-api/core/workingcalendar.py +++ b/myems-api/core/workingcalendar.py @@ -1,5 +1,5 @@ import falcon -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta import mysql.connector import simplejson as json from core.useractivity import admin_control, access_control, api_key_control diff --git a/myems-api/reports/energystoragepowerstationdetails.py b/myems-api/reports/energystoragepowerstationdetails.py index bedb0c2c26..f11e409dfa 100644 --- a/myems-api/reports/energystoragepowerstationdetails.py +++ b/myems-api/reports/energystoragepowerstationdetails.py @@ -1,6 +1,5 @@ import re -from datetime import datetime, timedelta, timezone -from decimal import Decimal +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/reports/energystoragepowerstationreporting.py b/myems-api/reports/energystoragepowerstationreporting.py index bedb0c2c26..f11e409dfa 100644 --- a/myems-api/reports/energystoragepowerstationreporting.py +++ b/myems-api/reports/energystoragepowerstationreporting.py @@ -1,6 +1,5 @@ import re -from datetime import datetime, timedelta, timezone -from decimal import Decimal +from datetime import datetime, timedelta import falcon import mysql.connector import simplejson as json diff --git a/myems-api/reports/offlinemeterinput.py b/myems-api/reports/offlinemeterinput.py index debff094fe..ce4c959379 100644 --- a/myems-api/reports/offlinemeterinput.py +++ b/myems-api/reports/offlinemeterinput.py @@ -95,11 +95,11 @@ def on_post(req, resp): add_values = (" INSERT INTO tbl_offline_meter_hourly " " (offline_meter_id, start_datetime_utc, actual_value) " " VALUES ") - sum = actual_value * 24 + sum_24hours = actual_value * 24 last_date_utc = end_datetime_utc - timedelta(minutes=config.minutes_to_count) while start_datetime_utc < end_datetime_utc: - if start_datetime_utc == last_date_utc and sum != daily_value: - actual_value = daily_value - sum + actual_value + if start_datetime_utc == last_date_utc and sum_24hours != daily_value: + actual_value = daily_value - sum_24hours + actual_value add_values += " (" + str(offline_meter_id) + "," add_values += "'" + start_datetime_utc.isoformat()[0:19] + "'," add_values += str(actual_value) + "), "