From 8cfd6e5f7d73aad898e9672606869ebf320e34e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Sat, 25 Jun 2022 11:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/am/migrations/0004_auto_20220625_1058.py | 24 +++++++++++++++++++
 apps/am/models.py                             | 19 ++++++++-------
 apps/am/serializers.py                        |  5 ++--
 apps/ecm/models.py                            |  2 +-
 4 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 apps/am/migrations/0004_auto_20220625_1058.py

diff --git a/apps/am/migrations/0004_auto_20220625_1058.py b/apps/am/migrations/0004_auto_20220625_1058.py
new file mode 100644
index 00000000..ece89795
--- /dev/null
+++ b/apps/am/migrations/0004_auto_20220625_1058.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.12 on 2022-06-25 02:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('am', '0003_area_count_people'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='area',
+            name='cate',
+            field=models.PositiveSmallIntegerField(default=10, verbose_name='区域分类'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='area',
+            name='level',
+            field=models.PositiveSmallIntegerField(verbose_name='区域风险等级'),
+        ),
+    ]
diff --git a/apps/am/models.py b/apps/am/models.py
index f203c890..c6ddfbea 100755
--- a/apps/am/models.py
+++ b/apps/am/models.py
@@ -8,15 +8,15 @@ class Area(CommonBModel):
     """
     地图区域
     """
-    AREA_LEVEL_1 = 10
-    AREA_LEVEL_2 = 20
-    AREA_LEVEL_3 = 30
-    AREA_LEVEL_4 = 40
+    AREA_1 = 10
+    AREA_2 = 20
+    AREA_3 = 30
+    AREA_4 = 40
     AREA_LEVEL_CHOICES = (
-        (AREA_LEVEL_1, '办公'),
-        (AREA_LEVEL_2, '生产一般'),
-        (AREA_LEVEL_3, '生产重点'),
-        (AREA_LEVEL_4, '四级')
+        (AREA_1, '办公'),
+        (AREA_2, '生产一般'),
+        (AREA_3, '生产重点'),
+        (AREA_4, '四级')
     )
     AREA_TYPE_FIX = 10
     AREA_TYPE_TEMP = 20
@@ -26,7 +26,8 @@ class Area(CommonBModel):
     )
     name = models.CharField('名称', max_length=20)
     type = models.PositiveSmallIntegerField('区域类型', default=10, choices=AREA_TYPE_CHOICES)
-    level = models.PositiveSmallIntegerField('区域等级')
+    level = models.PositiveSmallIntegerField('区域风险等级')
+    cate = models.PositiveSmallIntegerField('区域分类')
     number = models.CharField('编号', max_length=20, null=True, blank=True)
     visitor_yes = models.BooleanField('准许访客人员', default=False)
     remployee_yes = models.BooleanField('准许相关方人员', default=False)
diff --git a/apps/am/serializers.py b/apps/am/serializers.py
index 67c6c79d..22a1539a 100644
--- a/apps/am/serializers.py
+++ b/apps/am/serializers.py
@@ -6,7 +6,7 @@ from apps.system.serializers import PostSimpleSerializer
 class AreaSimpleSerializer(CustomModelSerializer):
     class Meta:
         model = Area
-        fields = ['id', 'name', 'level']
+        fields = ['id', 'name', 'level', 'cate']
 
 
 class AreaSerializer(CustomModelSerializer):
@@ -18,7 +18,8 @@ class AreaSerializer(CustomModelSerializer):
 class AreaCreateUpdateSerializer(CustomModelSerializer):
     class Meta:
         model = Area
-        fields = ['name', 'level', 'number', 'visitor_yes', 'remployee_yes', 'employee_yes', 'belong_dept']
+        fields = ['name', 'level', 'number', 'visitor_yes', 'remployee_yes', 'employee_yes',
+                  'belong_dept', 'count_people_min', 'count_people_max', 'count_people', 'cate']
 
 
 class AccessCreateSerializer(CustomModelSerializer):
diff --git a/apps/ecm/models.py b/apps/ecm/models.py
index 182f2dc0..a2122112 100644
--- a/apps/ecm/models.py
+++ b/apps/ecm/models.py
@@ -22,7 +22,7 @@ class EventCate(CommonAModel):
     speaker_on = models.BooleanField('开启音响报警', default=True)
     speakers = models.ManyToManyField(TDevice, verbose_name='固定音响', blank=True)
     filter_area_level = models.PositiveSmallIntegerField('固定音响区域级别过滤', choices=Area.AREA_LEVEL_CHOICES,
-                                                         default=Area.AREA_LEVEL_1)
+                                                         default=Area.AREA_1)
 
     def __str__(self):
         return self.name