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,