From 9aab833a57d00f5a21917da5e91e09225045a3d9 Mon Sep 17 00:00:00 2001 From: VladislavOstapov Date: Tue, 23 Jan 2024 16:50:23 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D1=81=D0=BE=D1=81=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D1=86=D0=B8=D0=B8=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=B1=D0=B4,=20=D0=BF=D0=BE=D1=81=D0=BA=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D1=83=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B8=D0=B3=D0=B4=D0=B5=20=D0=BD=D0=B5=20=D1=82?= =?UTF-8?q?=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=BF=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81=20=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D0=BE=D1=81=D0=BD=D0=BE=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logs_service/models.py | 16 ---------------- users/models.py | 5 ----- 2 files changed, 21 deletions(-) diff --git a/logs_service/models.py b/logs_service/models.py index c0e581a..7446b4a 100644 --- a/logs_service/models.py +++ b/logs_service/models.py @@ -31,19 +31,3 @@ class MbTankRecord(models.Model): 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] return result - - -class MbPumpRecord(models.Model): - dt = models.DateTimeField(verbose_name="Время записи", default=datetime.now) - - # состояния насосной - - pump_stage = models.SmallIntegerField(verbose_name="Состояние КА") - flow_meter = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Показания расходометра") - alarm = models.PositiveSmallIntegerField(verbose_name="Авария насосной станции") - - # состояния ПЧ - - vfd_alarm = models.PositiveSmallIntegerField(verbose_name="Авария ПЧ") - vfd_current = models.DecimalField(max_digits=5, decimal_places=2, verbose_name="Ток ПЧ") - vfd_freq = models.DecimalField(max_digits=5, decimal_places=2, verbose_name="Частота ПЧ") diff --git a/users/models.py b/users/models.py index 99e088c..4b142b9 100644 --- a/users/models.py +++ b/users/models.py @@ -51,11 +51,6 @@ class User(AbstractBaseUser): 'users.delete_user': 1, 'users.view_user': 1, - 'logs_service.add_mbpumprecord': 1, - 'logs_service.change_mbpumprecord': 1, - 'logs_service.delete_mbpumprecord': 1, - 'logs_service.view_mbpumprecord': 1, - 'logs_service.add_mbtankrecord': 1, 'logs_service.change_mbtankrecord': 1, 'logs_service.delete_mbtankrecord': 1,