From a623a006fbb8e5faa58fab5f0033c9a940e17f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 30 Jun 2022 11:14:29 +0800
Subject: [PATCH] =?UTF-8?q?area=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/am/migrations/0007_auto_20220630_1113.py | 26 +++++++++++++++++++
 apps/am/models.py                             |  1 +
 apps/ecm/models.py                            |  1 +
 apps/ecm/urls.py                              |  3 +--
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 apps/am/migrations/0007_auto_20220630_1113.py

diff --git a/apps/am/migrations/0007_auto_20220630_1113.py b/apps/am/migrations/0007_auto_20220630_1113.py
new file mode 100644
index 00000000..766b59fd
--- /dev/null
+++ b/apps/am/migrations/0007_auto_20220630_1113.py
@@ -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='对象类型'),
+        ),
+    ]
diff --git a/apps/am/models.py b/apps/am/models.py
index 65364734..b953a9be 100755
--- a/apps/am/models.py
+++ b/apps/am/models.py
@@ -40,6 +40,7 @@ class Area(CommonBModel):
     stay_minute_min = models.PositiveSmallIntegerField('最短停留时间', default=0, help_text='0代表未配置')
     stay_minute_max = models.PositiveSmallIntegerField('最长停留时间', default=0, help_text='0代表未配置')
     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,
                                   null=False, blank=True)
 
diff --git a/apps/ecm/models.py b/apps/ecm/models.py
index 658608e1..ccd24777 100644
--- a/apps/ecm/models.py
+++ b/apps/ecm/models.py
@@ -44,6 +44,7 @@ class NotifySetting(CommonAModel):
                              on_delete=models.CASCADE, null=True, blank=True)
     user = models.ForeignKey(User, verbose_name='提醒用户',
                              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_area_level = models.PositiveSmallIntegerField('区域级别过滤', null=True, blank=True)
     sms_enable = models.BooleanField('短信通知', default=False)
diff --git a/apps/ecm/urls.py b/apps/ecm/urls.py
index b70da6a6..5b989d5a 100644
--- a/apps/ecm/urls.py
+++ b/apps/ecm/urls.py
@@ -1,4 +1,4 @@
-from apps.am.tasks import cache_areas_info
+
 from apps.ecm.views import EventCateViewSet, NotifySettingViewSet, EventViewSet, RemindViewSet
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
@@ -6,7 +6,6 @@ from rest_framework.routers import DefaultRouter
 API_BASE_URL = 'api/ecm/'
 HTML_BASE_URL = 'ecm/'
 
-cache_areas_info()  # 首先缓存区域信息
 router = DefaultRouter()
 router.register('event_cate', EventCateViewSet, basename='event_cate')
 router.register('event', EventViewSet, basename='event')