diff --git a/backend/api/account/serializers/sensor_serializers.py b/backend/api/account/serializers/sensor_serializers.py index af74779..460fac2 100644 --- a/backend/api/account/serializers/sensor_serializers.py +++ b/backend/api/account/serializers/sensor_serializers.py @@ -1,13 +1,84 @@ from rest_framework import serializers -from django.conf import settings -from sitemanagement.models import Sensor, Metric, Alert +from sitemanagement.models import Sensor, Alert + +class NotificationSerializer(serializers.ModelSerializer): + type = serializers.SerializerMethodField() + priority = serializers.SerializerMethodField() + timestamp = serializers.DateTimeField(source='created_at') + acknowledged = serializers.BooleanField(source='resolved', default=False) + + class Meta: + model = Alert + fields = ('id', 'type', 'timestamp', 'acknowledged', 'priority') + + def get_type(self, obj): + return 'critical' if obj.severity == 'critical' else 'warning' + + def get_priority(self, obj): + return 'high' if obj.severity == 'critical' else 'medium' + +class DetectorSerializer(serializers.ModelSerializer): + detector_id = serializers.SerializerMethodField() + type = serializers.SerializerMethodField() + name = serializers.SerializerMethodField() + object = serializers.SerializerMethodField() + status = serializers.SerializerMethodField() + zone = serializers.SerializerMethodField() + floor = serializers.SerializerMethodField() + notifications = NotificationSerializer(source='alerts', many=True) -class SensorSerializer(serializers.ModelSerializer): class Meta: model = Sensor - fields = '__all__' + fields = ('detector_id', 'type', 'name', 'object', 'status', 'zone', 'floor', 'notifications') -class MetricSerializer(serializers.ModelSerializer): - class Meta: - model = Metric - fields = '__all__' \ No newline at end of file + def get_detector_id(self, obj): + return obj.name or f"{obj.sensor_type.code}-{obj.id}" + + def get_type(self, obj): + # маппинг типов сенсоров на нужные значения + sensor_type_mapping = { + 'GA': 'fire_detector', + 'PE': 'pressure_sensor', + 'GLE': 'gas_detector' + } + return sensor_type_mapping.get(obj.sensor_type.code, 'unknown') + + def get_name(self, obj): + return f"{obj.sensor_type.name} {obj.serial_number}" + + def get_object(self, obj): + # получаем первую зону датчика и её объект + zone = obj.zones.first() + if zone: + return zone.object.title + return None + + def get_status(self, obj): + # проверяем наличие активных алертов + latest_alert = obj.alerts.filter(resolved=False).first() + if latest_alert: + return latest_alert.severity # вернет 'warning' или 'critical' + return 'normal' + + def get_zone(self, obj): + zone = obj.zones.first() + if zone: + return zone.name + return None + + def get_floor(self, obj): + # получаем этаж из зоны + zone = obj.zones.first() + if zone: + return zone.floor + return None # если датчик не привязали к зоне + +class DetectorsResponseSerializer(serializers.Serializer): + detectors = serializers.SerializerMethodField() + + def get_detectors(self, sensors): + detector_serializer = DetectorSerializer(sensors, many=True) + return { + sensor['detector_id']: sensor + for sensor in detector_serializer.data + } \ No newline at end of file diff --git a/backend/api/account/urls.py b/backend/api/account/urls.py index 61fd686..af5c63a 100644 --- a/backend/api/account/urls.py +++ b/backend/api/account/urls.py @@ -1,6 +1,7 @@ from django.urls import path from .views.UserDataView import UserDataView from .views.objects_views import ObjectView +from .views.sensors_views import SensorView from drf_spectacular.views import ( SpectacularAPIView, SpectacularSwaggerView, @@ -23,4 +24,5 @@ urlpatterns = [ path("user/", UserDataView.as_view(), name="user-data"), path("get-objects/", ObjectView.as_view(), name="objects"), + path("get-detectors/", SensorView.as_view(), name="detectors"), ] diff --git a/backend/api/account/views/GetSensorDataView.py b/backend/api/account/views/GetSensorDataView.py deleted file mode 100644 index 92bc132..0000000 --- a/backend/api/account/views/GetSensorDataView.py +++ /dev/null @@ -1,10 +0,0 @@ -from rest_framework import status -from rest_framework.views import APIView -from rest_framework.permissions import IsAuthenticated -from rest_framework.response import Response -from drf_spectacular.utils import extend_schema, OpenApiResponse, OpenApiExample - -from api.auth.serializers import UserResponseSerializer -from api.models import UserProfile - -from api.utils.decorators import handle_exceptions \ No newline at end of file diff --git a/backend/api/account/views/objects_views.py b/backend/api/account/views/objects_views.py index 4c903e3..d7da2ab 100644 --- a/backend/api/account/views/objects_views.py +++ b/backend/api/account/views/objects_views.py @@ -2,13 +2,14 @@ from rest_framework import status from rest_framework.views import APIView from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response -from drf_spectacular.utils import extend_schema, OpenApiResponse +from drf_spectacular.utils import extend_schema, OpenApiResponse, OpenApiExample from api.account.serializers.objects_serializers import ObjectSerializer from sitemanagement.models import Object from api.utils.decorators import handle_exceptions +@extend_schema(tags=['Объекты']) class ObjectView(APIView): permission_classes = [IsAuthenticated] serializer_class = ObjectSerializer @@ -16,7 +17,34 @@ class ObjectView(APIView): @extend_schema( summary="Получение всех объектов", description="Получение всех объектов", - responses={200: OpenApiResponse(response=ObjectSerializer, description="Объекты успешно получены")}) + responses={200: OpenApiResponse(response=ObjectSerializer, description="Объекты успешно получены", + examples=[OpenApiExample( + 'Успешный ответ', + value={ + "id": 1, + "title": "Объект 1", + "description": "Описание объекта 1", + "image": "https://example.com/image.jpg", + "address": "Адрес объекта 1", + "floors": 1, + "area": 100.0, + "zones": [ + { + "id": 1, + "name": "Зона 1", + "sensors": [ + { + "id": 1, + "name": "Датчик 1", + "serial_number": "GA-123", + "sensor_type": "Тип датчика 1" + } + ] + } + ] + } + + )])}) @handle_exceptions def get(self, request): """Получение всех объектов с их зонами и датчиками""" diff --git a/backend/api/account/views/sensors_views.py b/backend/api/account/views/sensors_views.py new file mode 100644 index 0000000..7b2b773 --- /dev/null +++ b/backend/api/account/views/sensors_views.py @@ -0,0 +1,61 @@ +from rest_framework import status +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from drf_spectacular.utils import extend_schema, OpenApiResponse, OpenApiExample + +from api.account.serializers.sensor_serializers import DetectorsResponseSerializer +from sitemanagement.models import Sensor + +from api.utils.decorators import handle_exceptions + +@extend_schema(tags=['Датчики']) +class SensorView(APIView): + # permission_classes = [IsAuthenticated] + serializer_class = DetectorsResponseSerializer + + @extend_schema( + summary="Получение всех датчиков", + description="Получение всех датчиков в формате детекторов", + responses={200: OpenApiResponse(response=DetectorsResponseSerializer, description="Датчики успешно получены", + examples=[OpenApiExample( + 'Успешный ответ', + value={ + + "id": 1, + "type": "fire_detector", + "name": "Датчик 1", + "object": "Объект 1", + "status": "warning", + "zone": "Зона 1", + "floor": 1, + "notifications": [ + { + "id": 1, + "type": "warning", + "timestamp": "2024-01-15T14:30:00Z", + "acknowledged": False, + "priority": "high" + } + ] + } + )])}) + @handle_exceptions + def get(self, request): + """Получение всех датчиков""" + try: + sensors = Sensor.objects.select_related( + 'sensor_type', + 'signal_format' + ).prefetch_related( + 'zones', + 'zones__object', + 'alerts' + ).all() + + serializer = DetectorsResponseSerializer(sensors) + return Response(serializer.data, status=status.HTTP_200_OK) + except Sensor.DoesNotExist: + return Response( + {"error": "Датчики не найдены"}, + status=status.HTTP_404_NOT_FOUND) \ No newline at end of file diff --git a/backend/base/settings.py b/backend/base/settings.py index f82873f..4a86d3d 100644 --- a/backend/base/settings.py +++ b/backend/base/settings.py @@ -98,6 +98,8 @@ SPECTACULAR_SETTINGS = { {'name': 'Логаут', 'description': 'Метод для работы с логаутом'}, {'name': 'Логин', 'description': 'Методы для работы с логином'}, {'name': 'Профиль', 'description': 'Методы для получения данных профиля пользователя'}, + {'name': 'Объекты', 'description': 'Метод для получения данных об объектах'}, + {'name': 'Датчики', 'description': 'Методы для работы с датчиками'}, ], } diff --git a/backend/sitemanagement/admin.py b/backend/sitemanagement/admin.py index 5f0e348..ffe2be8 100644 --- a/backend/sitemanagement/admin.py +++ b/backend/sitemanagement/admin.py @@ -83,9 +83,10 @@ class ObjectAdmin(admin.ModelAdmin): @admin.register(Zone) class ZoneAdmin(admin.ModelAdmin): - list_display = ('object', 'name') - list_filter = ('object', 'name') - search_fields = ('object', 'name') + list_display = ('object', 'floor', 'name') + list_filter = ('object', 'floor') + search_fields = ('object__title', 'name') list_per_page = 10 list_max_show_all = 100 + list_editable = ('floor', 'name') list_display_links = ('object',) \ No newline at end of file diff --git a/backend/sitemanagement/migrations/0007_alter_zone_options_zone_floor.py b/backend/sitemanagement/migrations/0007_alter_zone_options_zone_floor.py new file mode 100644 index 0000000..ed28b64 --- /dev/null +++ b/backend/sitemanagement/migrations/0007_alter_zone_options_zone_floor.py @@ -0,0 +1,23 @@ +# Generated by Django 5.2.7 on 2025-10-06 12:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sitemanagement', '0006_object_zone'), + ] + + operations = [ + migrations.AlterModelOptions( + name='zone', + options={'ordering': ['object', 'floor', 'name'], 'verbose_name': 'Зона', 'verbose_name_plural': 'Зоны'}, + ), + migrations.AddField( + model_name='zone', + name='floor', + field=models.PositiveSmallIntegerField(default=1, verbose_name='Этаж'), + preserve_default=False, + ), + ] diff --git a/backend/sitemanagement/models.py b/backend/sitemanagement/models.py index eda53b9..22bd4ec 100644 --- a/backend/sitemanagement/models.py +++ b/backend/sitemanagement/models.py @@ -174,6 +174,7 @@ class Zone(models.Model): """Зона""" object = models.ForeignKey(Object, on_delete=models.CASCADE, related_name="zones", verbose_name="Объект") name = models.CharField(max_length=255, verbose_name="Название") + floor = models.PositiveSmallIntegerField(verbose_name="Этаж") sensors = models.ManyToManyField(Sensor, related_name="zones", verbose_name="Датчики") created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -181,8 +182,16 @@ class Zone(models.Model): class Meta: verbose_name = "Зона" verbose_name_plural = "Зоны" - ordering = ["object", "name"] + ordering = ["object", "floor", "name"] # сортировка сначала по объекту, потом по этажу + def clean(self): + from django.core.exceptions import ValidationError + # проверяем что номер этажа не превышает количество этажей в здании + if self.floor > self.object.floors: + raise ValidationError({ + 'floor': f'Номер этажа не может быть больше количества этажей в здании ({self.object.floors})' + }) + def __str__(self): - return f"{self.object.title} - {self.name}" + return f"{self.object.title} - Этаж {self.floor} - {self.name}" \ No newline at end of file