From 34dc9b6d9e380007a9b9d41a35bac74677db5c53 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 1 Feb 2021 21:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=85=B3=E9=97=AD=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E8=B7=9F=E8=B8=AA=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/tasks.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/safesite/tasks.py b/safesite/tasks.py index 2798fc0d..38f81f99 100644 --- a/safesite/tasks.py +++ b/safesite/tasks.py @@ -312,16 +312,21 @@ def sendGridtask(obj): def sendGridtask2(**kwargs): obj = GridTaskSet.objects.get(id=kwargs['gridtaskset']) if obj.trouble: - TroubleFollowTask.objects.filter(taskset=obj, usable=1).update(usable=0) - nowtime = datetime.datetime.now() - if obj.expire: - newm = nowtime + datetime.timedelta(hours=int(obj.expire)) - TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel) + if obj.trouble.yhzt == 6: + #如果隐患关闭了就直接停止计划任务 + obj.periodictask.enabled = False + obj.periodictask.save() else: - TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel) - obj.last_run_at = nowtime - obj.count = obj.count+1 - obj.save() + TroubleFollowTask.objects.filter(taskset=obj, usable=1).update(usable=0) + nowtime = datetime.datetime.now() + if obj.expire: + newm = nowtime + datetime.timedelta(hours=int(obj.expire)) + TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel) + else: + TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel) + obj.last_run_at = nowtime + obj.count = obj.count+1 + obj.save() elif obj.riskact: RiskActTask.objects.filter(taskset=obj, usable=1).update(usable=0)