From 4960ee7fac741a82b10b70f16749821e3aa4a66e Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 21 Aug 2024 17:55:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B0=B4=E6=B3=A5?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/services.py | 5 +++-- apps/enm/tasks.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/enm/services.py b/apps/enm/services.py index f5c234dc..beef1ed8 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -37,7 +37,8 @@ def translate_eval_formula(exp_str: str, year: int, month: int, day: int, hour: try: rval = eval(exp_str2) except Exception as e: - myLogger.error(f"表达式计算错误: {e}") + myLogger.error(f"表达式计算错误: {e}, {exp_str}, --{exp_str2}") + return rval def transfer_mpoint_val_to_ep_running_state(current_val, base_val: float, expr_str: str): @@ -342,7 +343,7 @@ def insert_mplogx_item(code: str, val, timex: datetime, enp_mpoints_dict): # 控制采集间隔 can_save = False if mpoint_last_timex: - if (timex - mpoint_last_timex).total_seconds() > mpoint_interval: + if (timex - mpoint_last_timex).total_seconds() > mpoint_interval or timex < mpoint_last_timex: can_save = True else: can_save = True diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index 3e06733b..4ce286d5 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -84,7 +84,7 @@ def db_ins_mplogx(): query = """ SELECT id, de_real_quantity, CONCAT('x', inv_name) AS inv_name, bill_date FROM sa_weigh_view - WHERE bill_date > %s + WHERE bill_date > %s and de_real_quantity > 0 ORDER BY bill_date """ cursor.execute(query, (bill_date,))