From a00a02bde633f0c863f0fdb13c5da600527a5b1f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 23 Feb 2024 13:47:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A8=A1=E6=8B=9F=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=8E=82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enp/migrations/0004_vehicleaccess.py | 2 +- apps/enp/mock.py | 22 +++++++++++++++++++++- apps/enp/models.py | 2 +- apps/enp/views.py | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/apps/enp/migrations/0004_vehicleaccess.py b/apps/enp/migrations/0004_vehicleaccess.py index 72e6321f..560df7d6 100644 --- a/apps/enp/migrations/0004_vehicleaccess.py +++ b/apps/enp/migrations/0004_vehicleaccess.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): default=1, help_text='1: 进厂, 2: 出厂', verbose_name='出入类型')), ('vehicle_number', models.CharField( max_length=10, verbose_name='车牌号')), - ('acess_time', models.DateTimeField( + ('access_time', models.DateTimeField( blank=True, null=True, verbose_name='出入时间')), ('emission_standard', models.CharField(blank=True, max_length=10, null=True, verbose_name='排放标准')), diff --git a/apps/enp/mock.py b/apps/enp/mock.py index ee0943cb..c1d9625c 100644 --- a/apps/enp/mock.py +++ b/apps/enp/mock.py @@ -1,6 +1,6 @@ import random from django.utils import timezone -from .models import CarWash +from .models import CarWash, VehicleAccess from apps.em.models import Equipment from apps.utils.snowflake import idWorker @@ -28,3 +28,23 @@ def generate_carwash_data(num_objects): pressure=pressures[i], flux=fluxes[i] ) + + +def generate_vehicleaccess_data(num_objects): + vehicle_numbers = ['ABC123', 'DEF456', 'GHI789', 'JKL012', 'MNO345'] + emission_standards = ['国五', '国六'] + types = [1, 2] + access_times = [timezone.now() - timezone.timedelta(minutes=n) + for n in range(10, 61, 10)] + door_name = '大门' + for i in range(num_objects): + access_time = access_times[i % len(access_times)] + VehicleAccess.objects.create( + id=idWorker.get_id(), + type=types[i % len(types)], + vehicle_number=vehicle_numbers[i % len(vehicle_numbers)], + emission_standard=emission_standards[i % len(emission_standards)], + door_name=door_name, + access_time=access_time, + create_time=access_time + ) diff --git a/apps/enp/models.py b/apps/enp/models.py index 32845355..095f379a 100644 --- a/apps/enp/models.py +++ b/apps/enp/models.py @@ -121,7 +121,7 @@ class VehicleAccess(BaseModel): type = models.PositiveSmallIntegerField( '出入类型', default=1, help_text='1: 进厂, 2: 出厂') vehicle_number = models.CharField('车牌号', max_length=10) - acess_time = models.DateTimeField('出入时间', null=True, blank=True) + access_time = models.DateTimeField('出入时间', null=True, blank=True) emission_standard = models.CharField( '排放标准', max_length=10, null=True, blank=True) door_name = models.CharField('门禁名称', max_length=10, null=True, blank=True) diff --git a/apps/enp/views.py b/apps/enp/views.py index cbe6f294..81b5a5c9 100644 --- a/apps/enp/views.py +++ b/apps/enp/views.py @@ -75,6 +75,7 @@ class VehicleAccessViewSet(ListModelMixin, CustomGenericViewSet): "vehicle_number": ['icontains'], "emission_standard": ['exact', 'in'], "type": ['exact', 'in'], + "acess_time": ['gte', 'lte', 'year', 'month', 'day', 'quarter', 'week'] }