fix / add logger fields to db tables

This commit is contained in:
Timofey
2025-08-25 12:15:49 +03:00
parent 2a8d5f1978
commit 691315da0d
10 changed files with 459 additions and 271 deletions

View File

@@ -9,6 +9,12 @@ class Multiplexor(models.Model):
subnet = models.GenericIPAddressField(null=True, blank=True)
gateway = models.GenericIPAddressField(null=True, blank=True)
sd_path = models.CharField(max_length=255, null=True, blank=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
verbose_name = "Мультиплексор"
verbose_name_plural = "Мультиплексоры"
ordering = ["name"]
def __str__(self):
return self.name
@@ -20,10 +26,14 @@ class Channel(models.Model):
number = models.PositiveSmallIntegerField() # CH-1 ... CH-14
# для "полканалов" можно использовать дробное значение (1, 1.5, 2, ...)
position = models.DecimalField(max_digits=4, decimal_places=1, default=Decimal("1.0"))
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
unique_together = ("multiplexor", "number", "position")
verbose_name = "Канал"
verbose_name_plural = "Каналы"
ordering = ["multiplexor", "number", "position"]
def __str__(self):
return f"{self.multiplexor.name} - CH{self.number} ({self.position})"
@@ -33,10 +43,16 @@ class SensorType(models.Model):
code = models.CharField(max_length=10, unique=True) # GA, PE, GLE
name = models.CharField(max_length=100)
description = models.TextField(blank=True, null=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
# пороговые значения для всех сенсоров этого типа
min_value = models.DecimalField(max_digits=12, decimal_places=4, null=True, blank=True)
max_value = models.DecimalField(max_digits=12, decimal_places=4, null=True, blank=True)
class Meta:
verbose_name = "Тип сенсора"
verbose_name_plural = "Типы сенсоров"
ordering = ["name"]
def __str__(self):
return self.code
@@ -48,10 +64,14 @@ class SignalFormat(models.Model):
code = models.CharField(max_length=50) # например "4-20мА", "VW f<1600Hz", "NTC R>250Ohm"
unit = models.CharField(max_length=20, blank=True, null=True) # °C, мкм/м, мм и т.п.
conversion_rule = models.CharField(max_length=255, blank=True, null=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
unique_together = ("sensor_type", "code")
verbose_name = "Формат сигнала"
verbose_name_plural = "Форматы сигналов"
ordering = ["sensor_type", "code"]
def __str__(self):
return f"{self.sensor_type.code} - {self.code}"
@@ -63,6 +83,12 @@ class Sensor(models.Model):
signal_format = models.ForeignKey(SignalFormat, on_delete=models.SET_NULL, null=True, blank=True)
serial_number = models.CharField(max_length=50, blank=True, null=True) # CL 2106009
name = models.CharField(max_length=50, blank=True, null=True) # GA-1, HLE-1 и т.п.
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
verbose_name = "Датчик"
verbose_name_plural = "Датчики"
ordering = ["channel", "sensor_type", "serial_number"]
def __str__(self):
return f"{self.name or self.sensor_type.code} ({self.serial_number})"
@@ -75,13 +101,18 @@ class Metric(models.Model):
raw_value = models.CharField(max_length=50) # исходное значение из файла (например "11.964 (A)")
value = models.FloatField(null=True, blank=True) # преобразованное значение
status = models.CharField(max_length=20, blank=True, null=True) # No Rx, Error, NotAv и т.д.
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
verbose_name = "Метрика"
verbose_name_plural = "Метрики"
ordering = ["timestamp", "sensor"]
indexes = [
models.Index(fields=["timestamp"]),
models.Index(fields=["sensor"]),
]
def __str__(self):
return f"{self.timestamp} {self.sensor} = {self.value} {self.sensor.signal_format.unit if self.sensor.signal_format else ''}"
@@ -101,6 +132,7 @@ class Alert(models.Model):
default="warning"
)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
resolved = models.BooleanField(default=False)
class Meta:
@@ -109,6 +141,9 @@ class Alert(models.Model):
models.Index(fields=["sensor"]),
models.Index(fields=["sensor_type"]),
]
verbose_name = "Тревога"
verbose_name_plural = "Тревоги"
ordering = ["created_at", "sensor"]
def __str__(self):
return f"ALERT {self.sensor} @ {self.metric.timestamp}: {self.message}"