发送事件推送短信bug
This commit is contained in:
parent
1921015120
commit
e7267ffd04
|
@ -7,6 +7,7 @@ from rest_framework.decorators import action
|
||||||
from apps.develop.serializers import CleanDataSerializer, GenerateVoiceSerializer, SendSmsSerializer, TestTaskSerializer
|
from apps.develop.serializers import CleanDataSerializer, GenerateVoiceSerializer, SendSmsSerializer, TestTaskSerializer
|
||||||
from apps.develop.tasks import backup_database, backup_media, reload_web_git, reload_server_git, reload_server_only
|
from apps.develop.tasks import backup_database, backup_media, reload_web_git, reload_server_git, reload_server_only
|
||||||
from rest_framework.exceptions import APIException
|
from rest_framework.exceptions import APIException
|
||||||
|
from apps.ecm.service import create_remind, notify_event
|
||||||
from apps.system.tasks import show
|
from apps.system.tasks import show
|
||||||
from apps.utils.sms import send_sms
|
from apps.utils.sms import send_sms
|
||||||
from apps.utils.speech import generate_voice
|
from apps.utils.speech import generate_voice
|
||||||
|
@ -148,6 +149,17 @@ class TestViewSet(CustomGenericViewSet):
|
||||||
# res = celery_control.revoke(task.task_id, terminate=True)
|
# res = celery_control.revoke(task.task_id, terminate=True)
|
||||||
return Response(ret)
|
return Response(ret)
|
||||||
|
|
||||||
|
@action(methods=['post'], detail=False, serializer_class=Serializer)
|
||||||
|
def remind_event(self, request, pk=None):
|
||||||
|
"""测试事件推送
|
||||||
|
|
||||||
|
测试事件推送
|
||||||
|
"""
|
||||||
|
from apps.ecm.models import Event
|
||||||
|
event = Event.objects.get(id='1562718567894487040')
|
||||||
|
create_remind(event, params={'area': '生产车间', 'employee': '访客石非凡', 'event': '未带安全帽'})
|
||||||
|
return Response()
|
||||||
|
|
||||||
@action(methods=['post'], detail=False, serializer_class=Serializer)
|
@action(methods=['post'], detail=False, serializer_class=Serializer)
|
||||||
def send_wx_msg(self, request, pk=None):
|
def send_wx_msg(self, request, pk=None):
|
||||||
"""微信模板消息发送测试
|
"""微信模板消息发送测试
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Generated by Django 3.2.12 on 2022-08-25 08:52
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('ecm', '0002_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='notifysetting',
|
||||||
|
name='filter_area_level',
|
||||||
|
field=models.PositiveSmallIntegerField(default=10, verbose_name='区域级别过滤'),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
]
|
|
@ -64,7 +64,7 @@ class NotifySetting(CommonADModel):
|
||||||
variable = models.CharField('提醒变量', max_length=20, null=True, blank=True,
|
variable = models.CharField('提醒变量', max_length=20, null=True, blank=True,
|
||||||
help_text='self(本人)/area_manager(区域负责人)/visit_receptionist(访客接待人)')
|
help_text='self(本人)/area_manager(区域负责人)/visit_receptionist(访客接待人)')
|
||||||
filter_recipient = models.PositiveSmallIntegerField('提醒人员过滤', null=True, blank=True)
|
filter_recipient = models.PositiveSmallIntegerField('提醒人员过滤', null=True, blank=True)
|
||||||
filter_area_level = models.PositiveSmallIntegerField('区域级别过滤', null=True, blank=True)
|
filter_area_level = models.PositiveSmallIntegerField('区域级别过滤')
|
||||||
sms_enable = models.BooleanField('短信通知', default=False)
|
sms_enable = models.BooleanField('短信通知', default=False)
|
||||||
wechat_enable = models.BooleanField('开启微信通知', default=False)
|
wechat_enable = models.BooleanField('开启微信通知', default=False)
|
||||||
can_handle = models.BooleanField('是否可处理', default=False)
|
can_handle = models.BooleanField('是否可处理', default=False)
|
||||||
|
|
Loading…
Reference in New Issue