feat: customlist替代listmixin

This commit is contained in:
caoqianming 2024-05-10 09:13:08 +08:00
parent ac524778e3
commit ebccaa2a50
2 changed files with 11 additions and 12 deletions

View File

@ -2,8 +2,7 @@ from django.shortcuts import render
from django.conf import settings
from apps.enm.models import Mpoint, MpointStat, EnStat, EnStat2, MpLogx
from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
from rest_framework.mixins import ListModelMixin
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin
from apps.enm.serializers import MpointSerializer, MpLogxSerializer, MpointStatSerializer, EnStatSerializer, EnStat2Serializer, ReCalSerializer
from apps.enm.filters import MpointStatFilter, EnStatFilter, EnStat2Filter
from apps.enm.tasks import cal_mpointstat_manual
@ -64,7 +63,7 @@ class MpointViewSet(CustomModelViewSet):
# filterset_fields = ['mpoint', 'mpoint__mgroup', 'mpoint__mgroup__belong_dept']
class MpLogxViewSet(ListModelMixin, CustomGenericViewSet):
class MpLogxViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list: 测点采集数据
@ -82,7 +81,7 @@ class MpLogxViewSet(ListModelMixin, CustomGenericViewSet):
ordering = ["-timex"]
class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, ListModelMixin, CustomGenericViewSet):
class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin, CustomGenericViewSet):
"""
list:测点统计记录
@ -118,7 +117,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, ListModelMi
return Response({"task_id": task.task_id})
class EnStatViewSet(ListModelMixin, CustomGenericViewSet):
class EnStatViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list:能耗统计记录
@ -133,7 +132,7 @@ class EnStatViewSet(ListModelMixin, CustomGenericViewSet):
ordering = ["mgroup__sort", "year_s", "month_s", "day_s", "hour"]
class EnStat2ViewSet(ListModelMixin, CustomGenericViewSet):
class EnStat2ViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list:全厂统计记录

View File

@ -1,6 +1,6 @@
from django.shortcuts import render
from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet, ListModelMixin
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin
from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin
from .serializers import DrainSerializer, DrainEquipSerializer, DrainEquipEnvSerializer, VehicleAccessSerializer, EnvDataSerializer, EnvDataExportSerializer, CarWashSerializer, Drain2Serializer
from .models import Drain, DrainEquip, VehicleAccess, EnvData, CarWash
from rest_framework.decorators import action
@ -57,7 +57,7 @@ class DrainViewSet(CustomModelViewSet):
return Response(json_result)
class DrainEquipViewSet(ListModelMixin, BulkCreateModelMixin, BulkDestroyModelMixin, CustomGenericViewSet):
class DrainEquipViewSet(CustomListModelMixin, BulkCreateModelMixin, BulkDestroyModelMixin, CustomGenericViewSet):
"""
list: 排口/设备关系
@ -85,7 +85,7 @@ class DrainEquipViewSet(ListModelMixin, BulkCreateModelMixin, BulkDestroyModelMi
return super().list(request, *args, **kwargs)
class VehicleAccessViewSet(ListModelMixin, CustomGenericViewSet):
class VehicleAccessViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list: 车辆出入记录
@ -104,7 +104,7 @@ class VehicleAccessViewSet(ListModelMixin, CustomGenericViewSet):
}
class EnvDataViewSet(ListModelMixin, CustomGenericViewSet):
class EnvDataViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list: 环保时序数据
@ -130,7 +130,7 @@ class EnvDataViewSet(ListModelMixin, CustomGenericViewSet):
return Response()
class CarWashViewSet(ListModelMixin, CustomGenericViewSet):
class CarWashViewSet(CustomListModelMixin, CustomGenericViewSet):
"""
list: 洗车记录