From 9b7af61ef5c3c501ee29b2e73c8f8bce15bb1a73 Mon Sep 17 00:00:00 2001
From: VladislavOstapov <vlados.ost.31@yandex.ru>
Date: Tue, 23 Jan 2024 13:02:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BC=D0=B5=D1=82=D0=BA=D1=83=20=D0=B2=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B2=20=D0=BB=D0=BE=D0=B3=D0=B0?=
 =?UTF-8?q?=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logs_service/models.py   |  6 +++---
 logs_service/services.py | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/logs_service/models.py b/logs_service/models.py
index a3fece4..754be42 100644
--- a/logs_service/models.py
+++ b/logs_service/models.py
@@ -1,10 +1,10 @@
 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
 
 
 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="Уровень воды по радару радара")
     level = models.PositiveSmallIntegerField(verbose_name="Уровень воды в % (пересчитан ПЛК)")
     status = models.PositiveSmallIntegerField(verbose_name="Регистр статуса")
@@ -14,7 +14,7 @@ class MbTankRecord(models.Model):
 
 
 class MbPumpRecord(models.Model):
-    dt = models.DateTimeField(verbose_name="Время записи", default=timezone.now)
+    dt = models.DateTimeField(verbose_name="Время записи", default=datetime.now)
 
     # состояния насосной
 
diff --git a/logs_service/services.py b/logs_service/services.py
index 6866046..0de1286 100644
--- a/logs_service/services.py
+++ b/logs_service/services.py
@@ -6,6 +6,18 @@ from datetime import datetime, timedelta
 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):
     def __init__(self, ip_addr, port, scan_rate, poll_time_ms=60000, save_days=60):
         super().__init__()
@@ -71,18 +83,6 @@ class MbService(Thread):
         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):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)