поправил метку времени в логах

This commit is contained in:
VladislavOstapov 2024-01-23 13:02:49 +03:00
parent 8a7b15f093
commit 9b7af61ef5
2 changed files with 15 additions and 15 deletions

View File

@ -1,10 +1,10 @@
from django.db import models from django.db import models
from django.utils import timezone from datetime import datetime
# select UNIX_TIMESTAMP(datetime), level_percentage, radar_low_reg, status_reg from tcs # select UNIX_TIMESTAMP(datetime), level_percentage, radar_low_reg, status_reg from tcs
class MbTankRecord(models.Model): class MbTankRecord(models.Model):
dt = models.DateTimeField(verbose_name="Время записи", default=timezone.now) dt = models.DateTimeField(verbose_name="Время записи", default=datetime.now)
radar_raw = models.PositiveIntegerField(verbose_name="Уровень воды по радару радара") radar_raw = models.PositiveIntegerField(verbose_name="Уровень воды по радару радара")
level = models.PositiveSmallIntegerField(verbose_name="Уровень воды в % (пересчитан ПЛК)") level = models.PositiveSmallIntegerField(verbose_name="Уровень воды в % (пересчитан ПЛК)")
status = models.PositiveSmallIntegerField(verbose_name="Регистр статуса") status = models.PositiveSmallIntegerField(verbose_name="Регистр статуса")
@ -14,7 +14,7 @@ class MbTankRecord(models.Model):
class MbPumpRecord(models.Model): class MbPumpRecord(models.Model):
dt = models.DateTimeField(verbose_name="Время записи", default=timezone.now) dt = models.DateTimeField(verbose_name="Время записи", default=datetime.now)
# состояния насосной # состояния насосной

View File

@ -6,6 +6,18 @@ from datetime import datetime, timedelta
from pyModbusTCP.client import ModbusClient from pyModbusTCP.client import ModbusClient
class MbClearHistoryService(Thread):
def __init__(self, model, save_days):
super().__init__()
self.model = model
self._days = save_days
def run(self):
while True:
self.model.objects.filter(dt__lt=(timezone.now() - timezone.timedelta(days=60))).delete()
time.sleep(10)
class MbService(Thread): class MbService(Thread):
def __init__(self, ip_addr, port, scan_rate, poll_time_ms=60000, save_days=60): def __init__(self, ip_addr, port, scan_rate, poll_time_ms=60000, save_days=60):
super().__init__() super().__init__()
@ -71,18 +83,6 @@ class MbService(Thread):
return {} return {}
class MbClearHistoryService(Thread):
def __init__(self, model, save_days):
super().__init__()
self.model = model
self._days = save_days
def run(self):
while True:
self.model.objects.filter(dt__lt=(timezone.now() - timezone.timedelta(days=60))).delete()
time.sleep(10)
class MbTankService(MbService): class MbTankService(MbService):
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)