zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start_mtask 返回mtask_id

This commit is contained in:
caoqianming 2022-10-14 18:16:06 +08:00
parent 3180af943c
commit b129355aec
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ecm/tasks.py
View File

@ -85,7 +85,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 < 14400 and algo_codes: # 一次任务不手动关闭最多持续4小时
for i in vchannels:
Thread(target=snap_and_analyse, args=(i, algo_codes, opl)).start()
time.sleep(10)

8
apps/opm/services.py
View File

@ -107,16 +107,18 @@ def opl_start(ticket: Ticket):
def start_mtask(opl: Opl):
op = opl.operation
mtask_id = None
vc_codes = []
# 找到作业点的摄像头, 如果指定摄像头就用指定的摄像头
if op.vchannels:
vc_codes = list(op.vchannels.all().values_list('code', flat=True))
opl_id = opl.id
task = opl_task.delay(vc_codes, opl_id)
time.sleep(3)
opl.mtask = TaskResult.objects.get(task_id=task.task_id)
mtask_id = task.id
opl.mtask = TaskResult.objects.get(task_id=mtask_id)
opl.save()
return dict(vc_codes=vc_codes)
return dict(vc_codes=[])
return dict(vc_codes=vc_codes, mtask_id=mtask_id)
def close_mtask(task_id: str):