area增加区域负责人
This commit is contained in:
parent
f8c35910a4
commit
a623a006fb
|
@ -0,0 +1,26 @@
|
||||||
|
# Generated by Django 3.2.12 on 2022-06-30 03:13
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
('am', '0006_auto_20220627_0836'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='area',
|
||||||
|
name='manager',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='区域负责人'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='access',
|
||||||
|
name='obj_cate',
|
||||||
|
field=models.CharField(help_text='post/org/people', max_length=20, verbose_name='对象类型'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -40,6 +40,7 @@ class Area(CommonBModel):
|
||||||
stay_minute_min = models.PositiveSmallIntegerField('最短停留时间', default=0, help_text='0代表未配置')
|
stay_minute_min = models.PositiveSmallIntegerField('最短停留时间', default=0, help_text='0代表未配置')
|
||||||
stay_minute_max = models.PositiveSmallIntegerField('最长停留时间', default=0, help_text='0代表未配置')
|
stay_minute_max = models.PositiveSmallIntegerField('最长停留时间', default=0, help_text='0代表未配置')
|
||||||
is_hidden = models.BooleanField('隐藏围栏用', default=False)
|
is_hidden = models.BooleanField('隐藏围栏用', default=False)
|
||||||
|
manager = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='区域负责人', null=True, blank=True)
|
||||||
third_info = models.JSONField('三方信息', default=dict,
|
third_info = models.JSONField('三方信息', default=dict,
|
||||||
null=False, blank=True)
|
null=False, blank=True)
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@ class NotifySetting(CommonAModel):
|
||||||
on_delete=models.CASCADE, null=True, blank=True)
|
on_delete=models.CASCADE, null=True, blank=True)
|
||||||
user = models.ForeignKey(User, verbose_name='提醒用户',
|
user = models.ForeignKey(User, verbose_name='提醒用户',
|
||||||
on_delete=models.CASCADE, null=True, blank=True)
|
on_delete=models.CASCADE, null=True, blank=True)
|
||||||
|
var = models.CharField('提醒变量', max_length=20, null=True, blank=True)
|
||||||
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('区域级别过滤', null=True, blank=True)
|
||||||
sms_enable = models.BooleanField('短信通知', default=False)
|
sms_enable = models.BooleanField('短信通知', default=False)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from apps.am.tasks import cache_areas_info
|
|
||||||
from apps.ecm.views import EventCateViewSet, NotifySettingViewSet, EventViewSet, RemindViewSet
|
from apps.ecm.views import EventCateViewSet, NotifySettingViewSet, EventViewSet, RemindViewSet
|
||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
from rest_framework.routers import DefaultRouter
|
from rest_framework.routers import DefaultRouter
|
||||||
|
@ -6,7 +6,6 @@ from rest_framework.routers import DefaultRouter
|
||||||
API_BASE_URL = 'api/ecm/'
|
API_BASE_URL = 'api/ecm/'
|
||||||
HTML_BASE_URL = 'ecm/'
|
HTML_BASE_URL = 'ecm/'
|
||||||
|
|
||||||
cache_areas_info() # 首先缓存区域信息
|
|
||||||
router = DefaultRouter()
|
router = DefaultRouter()
|
||||||
router.register('event_cate', EventCateViewSet, basename='event_cate')
|
router.register('event_cate', EventCateViewSet, basename='event_cate')
|
||||||
router.register('event', EventViewSet, basename='event')
|
router.register('event', EventViewSet, basename='event')
|
||||||
|
|
Loading…
Reference in New Issue