From 870d87b44d3787bbbb0baaf276d2a86070d1578d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 11 Feb 2023 17:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=BB=E5=BA=95=E5=81=9C=E6=AD=A2=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/tasks.py | 2 +-
 apps/opm/views.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/ecm/tasks.py b/apps/ecm/tasks.py
index 0a4b2ffe..bf80ffb1 100644
--- a/apps/ecm/tasks.py
+++ b/apps/ecm/tasks.py
@@ -105,7 +105,7 @@ def opl_task(vc_codes: list, opl_id: str):
     algo_codes = list(EventCate.objects.filter(opl_cates=opl_cate).values_list('code', flat=True))
     vchannels = TDevice.objects.filter(code__in=vc_codes)
     opl = Opl.objects.get(id=opl_id)
-    while time.time()-start_time < 14400:   # 一次任务不手动关闭最多持续4小时
+    while time.time()-start_time < 10800:   # 一次任务不手动关闭最多持续3小时
         for i in vchannels:
             Thread(target=snap_and_analyse, args=(i, algo_codes, opl)).start()
         time.sleep(10)
diff --git a/apps/opm/views.py b/apps/opm/views.py
index b0ff6389..e17ea1fe 100644
--- a/apps/opm/views.py
+++ b/apps/opm/views.py
@@ -130,7 +130,10 @@ class OplViewSet(CustomModelViewSet):
         obj = self.get_object()
         if obj.mtask_uid:
             close_mtask(obj.mtask_uid)
-            # 防止没变化，手动处理一下
+        from django_celery_results.models import TaskResult
+        qs = TaskResult.objects.filter(task_args__contains=obj.id, status__in=['PENDING', 'RECEIVED', 'STARTED'])
+        for i in qs:
+            close_mtask(i.task_id)
         obj.mtask_uid = None
         obj.save()
         return Response()