From 66af6475d9c927c0c399b892051f17b34c45819c Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 9 Oct 2024 09:26:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=97=B6=E5=80=99=E5=87=BA=E7=8E=B00=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/develop/views.py | 10 ++++++++++ apps/enm/services.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/develop/views.py b/apps/develop/views.py index 6bb2d8e0..42d7abbe 100755 --- a/apps/develop/views.py +++ b/apps/develop/views.py @@ -390,6 +390,16 @@ class TestViewSet(CustomGenericViewSet): test_snap_list.append(task_id) cache.set('test_snap_task', test_snap_list) return Response({'test_snap_task': task_id}) + + @action(methods=['post'], detail=False, serializer_class=Serializer) + def stop_celery_task(self, request, pk=None): + """" + 关闭重跑重跑能源计算任务 + """ + from server.celery import celery_control + celery_control.revoke(request.data['task_id'], terminate=True) + return Response() + @action(methods=['post'], detail=False, serializer_class=Serializer) def close_snap_task(self, request, pk=None): diff --git a/apps/enm/services.py b/apps/enm/services.py index 3cf70b66..f513728b 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -158,7 +158,7 @@ class MpointCache: mpoint_data["last_data"] = {"last_val": None, "last_timex": None, "last_mrs": None} # 初始化 if update_mplogx: now = timezone.now() - last_mplogx = MpLogx.objects.filter(mpoint=mpoint, timex__gte=now - timedelta(minutes=5)).order_by("-timex").first() + last_mplogx = MpLogx.objects.filter(mpoint=mpoint, timex__gte=now - timedelta(minutes=10)).order_by("-timex").first() if last_mplogx: # 核心数据 mpoint_data["last_data"] = {"last_val": getattr(last_mplogx, "val_" + mpoint_data["val_type"]), "last_timex": last_mplogx.timex} cache.set(key, mpoint_data, timeout=None) @@ -190,7 +190,7 @@ class MpointCache: current_cache_val.get('is_rep_ep_running_state', None) is False and get_sysconfig('enm.use_cache_when_w_el_0', False) is True and current_cache_val.get("material_name", "") in ["动力电", "工业水"]): # 如果电表断电 - pass + last_val = last_data["last_val"] if last_data["last_val"] is not None else 0 else: last_data["last_val"] = last_val last_data["last_timex"] = last_timex