增加happen_time
This commit is contained in:
parent
30946793b8
commit
2ec6f45525
|
@ -0,0 +1,26 @@
|
||||||
|
# Generated by Django 3.2.12 on 2022-07-04 07:04
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('ecm', '0008_auto_20220704_0841'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='remind',
|
||||||
|
name='dept',
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='remind',
|
||||||
|
name='post',
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='event',
|
||||||
|
name='happen_time',
|
||||||
|
field=models.DateTimeField(blank=True, null=True, verbose_name='事件发生时间'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -90,6 +90,7 @@ class Event(CommonBModel):
|
||||||
voice = models.TextField('语音地址', null=True, blank=True)
|
voice = models.TextField('语音地址', null=True, blank=True)
|
||||||
is_timeout = models.BooleanField('是否超时', default=False)
|
is_timeout = models.BooleanField('是否超时', default=False)
|
||||||
mark = models.PositiveSmallIntegerField('事件标记', default=10, help_text='10(正常)/20(误报)')
|
mark = models.PositiveSmallIntegerField('事件标记', default=10, help_text='10(正常)/20(误报)')
|
||||||
|
happen_time = models.DateTimeField('事件发生时间', null=True, blank=True)
|
||||||
handle_time = models.DateTimeField('处理时间', null=True, blank=True)
|
handle_time = models.DateTimeField('处理时间', null=True, blank=True)
|
||||||
handle_user = models.ForeignKey(User, verbose_name='处理人',
|
handle_user = models.ForeignKey(User, verbose_name='处理人',
|
||||||
on_delete=models.CASCADE, null=True, blank=True)
|
on_delete=models.CASCADE, null=True, blank=True)
|
||||||
|
|
|
@ -21,6 +21,7 @@ from django.conf import settings
|
||||||
import os
|
import os
|
||||||
from apps.utils.speech import generate_voice
|
from apps.utils.speech import generate_voice
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
from apps.utils.tools import timestamp_to_time
|
||||||
|
|
||||||
from apps.vm.models import Visit
|
from apps.vm.models import Visit
|
||||||
requests.packages.urllib3.disable_warnings()
|
requests.packages.urllib3.disable_warnings()
|
||||||
|
@ -203,8 +204,9 @@ def create_remind(event: Event):
|
||||||
# 开始发送通知
|
# 开始发送通知
|
||||||
for i in Remind.objects.filter(event=event):
|
for i in Remind.objects.filter(event=event):
|
||||||
if i.notify_setting.sms_enable:
|
if i.notify_setting.sms_enable:
|
||||||
if i.user.employee.phone:
|
if i.recipient.employee.phone:
|
||||||
Thread(target=send_sms, args=(i.user.employee.phone, '1001', {'code': '5678'}), daemon=True).start()
|
Thread(target=send_sms, args=(i.recipient.employee.phone,
|
||||||
|
'1001', {'code': '5678'}), daemon=True).start()
|
||||||
if i.notify_setting.wechat_enable:
|
if i.notify_setting.wechat_enable:
|
||||||
pass
|
pass
|
||||||
event.is_pushed = True
|
event.is_pushed = True
|
||||||
|
@ -243,6 +245,7 @@ def dispatch_dahua_event(data: dict):
|
||||||
event.obj_cate = obj_cate
|
event.obj_cate = obj_cate
|
||||||
event.vchannel = vchannel
|
event.vchannel = vchannel
|
||||||
event.employee = ep
|
event.employee = ep
|
||||||
|
event.happen_time = timestamp_to_time(int(data['info']['alarmDate']))
|
||||||
event.save()
|
event.save()
|
||||||
for i in ecs:
|
for i in ecs:
|
||||||
Eventdo.objects.get_or_create(cate=i, event=event, defaults={
|
Eventdo.objects.get_or_create(cate=i, event=event, defaults={
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import textwrap
|
import textwrap
|
||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
import time
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
def print_roundtrip(response, *args, **kwargs):
|
def print_roundtrip(response, *args, **kwargs):
|
||||||
|
@ -35,6 +35,11 @@ def rannum(num):
|
||||||
return salt
|
return salt
|
||||||
|
|
||||||
|
|
||||||
|
def timestamp_to_time(millis):
|
||||||
|
"""10位时间戳转换为日期格式字符串"""
|
||||||
|
return datetime.fromtimestamp(millis)
|
||||||
|
|
||||||
|
|
||||||
def p_in_poly(p, poly):
|
def p_in_poly(p, poly):
|
||||||
px = p['x']
|
px = p['x']
|
||||||
py = p['y']
|
py = p['y']
|
||||||
|
|
Loading…
Reference in New Issue