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

---
 logs_service/models.py   |  2 +-
 logs_service/services.py | 19 +------------------
 templates/index.html     |  2 +-
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/logs_service/models.py b/logs_service/models.py
index 7446b4a..76ae1e0 100644
--- a/logs_service/models.py
+++ b/logs_service/models.py
@@ -26,7 +26,7 @@ class MbTankRecord(models.Model):
         if last_save is not None:
             result['last_update'] = last_save.dt.timestamp()
             result['level'] = last_save.level
-            result['radar'] = last_save.radar_raw
+            result['radar'] = last_save.radar_raw / 10000
             result['status'] = last_save.status
             query = MbTankRecord.objects.filter(dt__gt=(datetime.now() - timedelta(minutes=15))).order_by('dt')
             result['last_radar_values'] = [(int(item.dt.timestamp()), item.radar_raw) for item in query]
diff --git a/logs_service/services.py b/logs_service/services.py
index f25cce1..3af830f 100644
--- a/logs_service/services.py
+++ b/logs_service/services.py
@@ -49,7 +49,7 @@ class MbService(Thread):
         """
             Функция должна вернуть результат: нужно ли сохранять текущее состояние в базу данных
         """
-        return True
+        return False
 
     def run(self):
         # if self.log_type == 'on-change':
@@ -115,9 +115,6 @@ class MbTankService(MbService):
             "radar": (values[1] << 16) | values[2]
         }
 
-    def _check_need_save(self):
-        return True
-
 
 class MbPumpService(MbService):
     def __init__(self, **kwargs):
@@ -125,17 +122,6 @@ class MbPumpService(MbService):
         self._lock = Lock()
 
         self._curr_state = None
-        # {
-        #      "level": int,
-        #      "status": int,
-        #      "radar": int
-        # }
-
-    def _init_state(self):
-        pass
-
-    def _push_current_state(self):
-        pass
 
     def _load_current_state(self):
         # D16: flow_meter
@@ -175,9 +161,6 @@ class MbPumpService(MbService):
                 'half_auto_control': values[30 - off]
             }
 
-    def _check_need_save(self):
-        return False
-
     def get_stats(self):
         with self._lock:
             # копируем данные, если они есть в текущем состоянии (иначе пустые поля)
diff --git a/templates/index.html b/templates/index.html
index b8191bb..7ed9236 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -76,7 +76,7 @@
                 <p>Частота ПЧ: <span id="pump-vfd-freq"></span>Гц</p>
                 <p>Ток ПЧ: <span id="pump-vfd-curr"></span>А</p>
                 <p>Ошибка ПЧ: <span id="pump-vfd-error"></span></p>
-                <p>Текущее значение с радара: <span id="tank-raw-now"></span></p>
+                <p>Текущее значение с радара: <span id="tank-raw-now"></span>м</p>
             </div>
             <div class="params-group">
                 <p>Запущенный насос: <span id="pump-running"></span></p>