vpeople增加防疫相关内容

apps/third/views.py

@@ -19,7 +19,6 @@ from rest_framework.decorators import action
 from apps.third.serializers import PicSerializer, RequestCommonSerializer
 from rest_framework import serializers
 from django.conf import settings
-import stomp
 from django.conf import settings
 from django.core.cache import cache
 myLogger = logging.getLogger('log')

apps/vm/migrations/0005_auto_20221010_1013.py

@@ -0,0 +1,58 @@
+# Generated by Django 3.2.12 on 2022-10-10 02:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vm', '0004_alter_visit_purpose'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vpeople',
+            name='come_place',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='来源地'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='health_code',
+            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='健康码'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='is_reported',
+            field=models.BooleanField(default=True, verbose_name='是否报备'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='measure',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='管控措施'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='return_date',
+            field=models.DateField(blank=True, null=True, verbose_name='返乡时间'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='test_date',
+            field=models.DateField(blank=True, null=True, verbose_name='核酸检测日期'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='test_report',
+            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='核酸报告'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='travel_code',
+            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='行程码'),
+        ),
+        migrations.AddField(
+            model_name='vpeople',
+            name='trip_desc',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='行程轨迹'),
+        ),
+    ]

apps/vm/models.py

@@ -73,3 +73,15 @@ class Vpeople(BaseModel):
     visit = models.ForeignKey(Visit, verbose_name='关联访问项目', on_delete=models.CASCADE)
     visitor = models.ForeignKey(Visitor, verbose_name='访客', on_delete=models.CASCADE)
     is_main = models.BooleanField('是否主访人', default=False)
+
+    return_date = models.DateField('返乡时间', null=True, blank=True)
+    come_place = models.CharField('来源地', max_length=100, null=True, blank=True)
+    trip_desc = models.CharField('行程轨迹', max_length=200, null=True, blank=True)
+    measure = models.CharField('管控措施', max_length=20, null=True, blank=True)
+    test_date = models.DateField('核酸检测日期', null=True, blank=True)
+    is_reported = models.BooleanField('是否报备', default=True)
+    health_code = models.CharField('健康码', max_length=1000, null=True, blank=True)
+    travel_code = models.CharField('行程码', max_length=1000, null=True, blank=True)
+    test_report = models.CharField('核酸报告', max_length=1000, null=True, blank=True)
+
+

apps/vm/serializers.py

@@ -65,7 +65,7 @@ class VisitorSerializer(CustomModelSerializer):
 class VpeopleCreateSerializer(CustomModelSerializer):
     class Meta:
         model = Vpeople
-        fields = ['visit', 'visitor', 'is_main']
+        fields = '__all__'
 
     def create(self, validated_data):
         visit = validated_data['visit']

requirements.txt

@@ -18,8 +18,7 @@ daphne==3.0.2
 channels==3.0.4
 channels-redis==3.4.0
 django-restql==0.15.2
-stomp.py==8.0.0
+shapely==1.8.3
-shapely==1.8.2
 aliyun-python-sdk-core==2.13.36
 baidu-aip==4.16.6
 chardet==5.0.0
@@ -29,5 +28,4 @@ grpcio-tools==1.47.0
 protobuf==3.20.1
 pycryptodome==3.15.0
 aliyun-python-sdk-core==2.13.36
-shapely==1.8.3