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

开启作业监控优化

This commit is contained in:
曹前明 2022-09-12 19:53:17 +08:00
parent 735ba1e977
commit 19620d2bd5
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/opm/services.py
View File

@ -59,6 +59,13 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
op.save() op.save()
def t_submit_close_mtask(ticket: Ticket, transition: Transition, new_ticket_data: dict):
# 提交作业关闭时关闭作业监控
opl = Opl.objects.filter(ticket=ticket).first()
if opl and opl.mtask:
close_mtask(opl.mtask.task_id)
def opl_audit_end(ticket: Ticket): def opl_audit_end(ticket: Ticket):
# 任务执行1 # 任务执行1
opl = Opl.objects.get(ticket=ticket) opl = Opl.objects.get(ticket=ticket)
@ -99,11 +106,13 @@ def start_mtask(opl: Opl):
# 找到作业点的摄像头, 如果指定摄像头就用指定的摄像头 # 找到作业点的摄像头, 如果指定摄像头就用指定的摄像头
if op.vchannels: if op.vchannels:
vc_codes = list(op.vchannels.all().values_list('code', flat=True)) vc_codes = list(op.vchannels.all().values_list('code', flat=True))
opl_id = opl.id opl_id = opl.id
task = opl_task.delay(vc_codes, opl_id) task = opl_task.delay(vc_codes, opl_id)
time.sleep(3) time.sleep(3)
opl.mtask = TaskResult.objects.get(task_id=task.task_id) opl.mtask = TaskResult.objects.get(task_id=task.task_id)
opl.save() opl.save()
return dict(vc_codes=vc_codes)
return dict(vc_codes=[])
def close_mtask(task_id: str): def close_mtask(task_id: str):

4
apps/opm/views.py
View File

@ -86,8 +86,8 @@ class OplViewSet(CustomModelViewSet):
if obj.mtask: if obj.mtask:
# 先关闭 # 先关闭
close_mtask(obj.mtask.task_id) close_mtask(obj.mtask.task_id)
start_mtask(obj) res = start_mtask(obj)
return Response() return Response(res)
@action(methods=['post'], detail=True, perms_map={'post': '*'}, @action(methods=['post'], detail=True, perms_map={'post': '*'},
serializer_class=Serializer, logging_methods=[]) serializer_class=Serializer, logging_methods=[])