From 3fff29418968321eadf6b56a80913f6b740764bf Mon Sep 17 00:00:00 2001 From: zty Date: Mon, 18 Nov 2024 13:51:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20enm=20=E4=BF=AE=E6=94=B9=20=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BA=A7=E5=93=81=E7=BB=BC=E5=90=88=E8=83=BD=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/services.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index 29e319be..d91e3134 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -474,9 +474,12 @@ def get_analyse_data_mgroups_duration(start_date: datetime, end_date: datetime) elec_consume_mm = res_dict.get("煤磨", {}).get("elec_consume", 0) if item["total_production"] == 0: item["celec_consume_unit"] = 0 - item["en_consume_unit"] = 0 + item["cen_consume_unit"] = 0 else: - item["celec_consume_unit"] = round((elec_consume_mm + item["elec_consume"]) / item["total_production"] + get_sysconfig("enm.enm_lhxs") * elec_consume_ylm / total_production_ylm, 2) - item["en_consume_unit"] = round(item["coal_consume_unit"] + 0.1229 * item["elec_consume_unit"], 2) + item["celec_consume_unit"] = round((elec_consume_mm + item["elec_consume"]) / get_safe_value(item["total_production"]) + get_sysconfig("enm.enm_lhxs") * elec_consume_ylm / get_safe_value(total_production_ylm), 2) + item["cen_consume_unit"] = round(item["coal_consume_unit"] + 0.1229 * item["elec_consume_unit"], 2) item["total_production"] = round(item["total_production"], 2) - return res \ No newline at end of file + return res + +def get_safe_value(value, default=1): + return value if value != 0 else default \ No newline at end of file