From 60c08151e13fb10f4ad207eeb1aff5b14a2a57ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 12 Jul 2022 16:29:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E8=87=AA=E5=8A=A8=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0003_alter_access_obj_cate.py  | 18 +++++++++++
 .../migrations/0007_auto_20220712_1628.py     | 32 +++++++++++++++++++
 apps/third/models.py                          |  4 ++-
 apps/third/serializers.py                     |  2 +-
 apps/third/views_d.py                         |  3 +-
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 apps/am/migrations/0003_alter_access_obj_cate.py
 create mode 100644 apps/third/migrations/0007_auto_20220712_1628.py

diff --git a/apps/am/migrations/0003_alter_access_obj_cate.py b/apps/am/migrations/0003_alter_access_obj_cate.py
new file mode 100644
index 00000000..8e8416a0
--- /dev/null
+++ b/apps/am/migrations/0003_alter_access_obj_cate.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-07-12 08:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('am', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='access',
+            name='obj_cate',
+            field=models.CharField(help_text='post/org/people/visit', max_length=20, verbose_name='对象类型'),
+        ),
+    ]
diff --git a/apps/third/migrations/0007_auto_20220712_1628.py b/apps/third/migrations/0007_auto_20220712_1628.py
new file mode 100644
index 00000000..ee329c14
--- /dev/null
+++ b/apps/third/migrations/0007_auto_20220712_1628.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.12 on 2022-07-12 08:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('third', '0006_tdevice_door_auth_list'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='tdevice',
+            name='door_auth_list',
+        ),
+        migrations.AddField(
+            model_name='tdevice',
+            name='employee_yes',
+            field=models.BooleanField(default=True, verbose_name='自动下发员工'),
+        ),
+        migrations.AddField(
+            model_name='tdevice',
+            name='remployee_yes',
+            field=models.BooleanField(default=True, verbose_name='自动下发相关方'),
+        ),
+        migrations.AddField(
+            model_name='tdevice',
+            name='visitor_yes',
+            field=models.BooleanField(default=True, verbose_name='自动下发访客'),
+        ),
+    ]
diff --git a/apps/third/models.py b/apps/third/models.py
index f8a4e41f..5e2a7c51 100755
--- a/apps/third/models.py
+++ b/apps/third/models.py
@@ -43,7 +43,9 @@ class TDevice(BaseModel):
     employee = models.OneToOneField(Employee, verbose_name='当前绑定人员', on_delete=models.CASCADE,
                                     null=True, blank=True)
     is_clock = models.BooleanField('是否打卡设备', default=False)
-    door_auth_list = models.JSONField('自动下发人员类型列表', default=list, blank=True)
+    visitor_yes = models.BooleanField('自动下发访客', default=True)
+    remployee_yes = models.BooleanField('自动下发相关方', default=True)
+    employee_yes = models.BooleanField('自动下发员工', default=True)
     third_info = models.JSONField('三方信息', default=dict,
                                   null=False, blank=True)
 
diff --git a/apps/third/serializers.py b/apps/third/serializers.py
index 30ec7a0d..aa11e2c1 100755
--- a/apps/third/serializers.py
+++ b/apps/third/serializers.py
@@ -23,7 +23,7 @@ class TDeviceSerializer(CustomModelSerializer):
 class TDeviceUpdateSerializer(CustomModelSerializer):
     class Meta:
         model = TDevice
-        fields = ['is_clock', 'door_auth_list']
+        fields = ['is_clock', 'visitor_yes', 'remployee_yes', 'employee_yes']
 
 
 class TDeviceSimpleSerializer(CustomModelSerializer):
diff --git a/apps/third/views_d.py b/apps/third/views_d.py
index 77075bb1..aaebe8b2 100644
--- a/apps/third/views_d.py
+++ b/apps/third/views_d.py
@@ -1,6 +1,6 @@
 from apps.third.filters import TDeviceFilterSet
 from apps.third.models import BltBind, TDevice, Tlog
-from apps.third.serializers import BindAreaSerializer, BltBindCreateSerializer, BltQuerySerializer, BltSerializer, LabelLocationSerializer, TDeviceSerializer, TlogSerializer
+from apps.third.serializers import BindAreaSerializer, BltBindCreateSerializer, BltQuerySerializer, BltSerializer, LabelLocationSerializer, TDeviceSerializer, TDeviceUpdateSerializer, TlogSerializer
 from apps.utils.viewsets import CustomGenericViewSet
 from rest_framework.mixins import ListModelMixin, CreateModelMixin
 from apps.third.clients import xxClient, dhClient, spClient
@@ -117,6 +117,7 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
     """
     queryset = TDevice.objects.all()
     serializer_class = TDeviceSerializer
+    update_serializer_class = TDeviceUpdateSerializer
     ordering = ['-create_time']
     filterset_class = TDeviceFilterSet
     select_related_fields = ['employee', 'area', 'employee__post', 'employee__belong_dept']