zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: hour计数改为sec计数 步骤3移除字段

This commit is contained in:
caoqianming 2024-05-15 10:40:46 +08:00
parent b4b3d6eadc
commit 3d6adedb8c
4 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/enm/migrations/0036_auto_20240515_1037.py Normal file
View File

@ -0,0 +1,25 @@
# Generated by Django 3.2.12 on 2024-05-15 02:37
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('enm', '0035_auto_20240515_0949'),
]
operations = [
migrations.RemoveField(
model_name='enstat',
name='run_hour',
),
migrations.RemoveField(
model_name='enstat',
name='shut_hour',
),
migrations.RemoveField(
model_name='enstat',
name='total_hour_now',
),
]

3
apps/enm/models.py
View File

@ -138,9 +138,6 @@ class EnStat(BaseModel):
total_sec_now = models.PositiveIntegerField("动态总时长", default=0, help_text="s") total_sec_now = models.PositiveIntegerField("动态总时长", default=0, help_text="s")
run_sec = models.PositiveIntegerField("运转时长", default=0, help_text="s") run_sec = models.PositiveIntegerField("运转时长", default=0, help_text="s")
shut_sec = models.PositiveIntegerField("停机时长", default=0, help_text="s") shut_sec = models.PositiveIntegerField("停机时长", default=0, help_text="s")
total_hour_now = models.FloatField("动态总时长", default=0, help_text="h")
run_hour = models.FloatField("运转时长", default=0, help_text="h")
shut_hour = models.FloatField("停机时长", default=0, help_text="h")
run_rate = models.FloatField("运转率", default=0, help_text="%") run_rate = models.FloatField("运转率", default=0, help_text="%")

33
apps/wpm/migrations/0046_auto_20240515_1037.py Normal file
View File

@ -0,0 +1,33 @@
# Generated by Django 3.2.12 on 2024-05-15 02:37
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('wpm', '0045_auto_20240515_1001'),
]
operations = [
migrations.RemoveField(
model_name='sflog',
name='shut_hour',
),
migrations.RemoveField(
model_name='sflog',
name='total_hour',
),
migrations.RemoveField(
model_name='sflog',
name='total_hour_now',
),
migrations.RemoveField(
model_name='sflogexp',
name='duration',
),
migrations.RemoveField(
model_name='stlog',
name='duration',
),
]

5
apps/wpm/models.py
View File

@ -32,9 +32,6 @@ class SfLog(CommonADModel):
total_sec_now = models.PositiveIntegerField('总时长动', default=0) total_sec_now = models.PositiveIntegerField('总时长动', default=0)
total_sec = models.PositiveIntegerField('总时长', default=43200) total_sec = models.PositiveIntegerField('总时长', default=43200)
shut_sec = models.PositiveIntegerField('停机时长', default=0) shut_sec = models.PositiveIntegerField('停机时长', default=0)
total_hour_now = models.FloatField('总时长动', default=0)
total_hour = models.FloatField('总时长', default=12)
shut_hour = models.FloatField('停机时长', default=0)
pcoal_heat = models.FloatField('煤粉热值', null=True, blank=True) pcoal_heat = models.FloatField('煤粉热值', null=True, blank=True)
@property @property
@ -63,7 +60,6 @@ class StLog(CommonADModel):
start_time = models.DateTimeField('发生时间') start_time = models.DateTimeField('发生时间')
end_time = models.DateTimeField('结束时间', null=True, blank=True) end_time = models.DateTimeField('结束时间', null=True, blank=True)
duration_sec = models.PositiveIntegerField('持续时长(s)', null=True, blank=True) duration_sec = models.PositiveIntegerField('持续时长(s)', null=True, blank=True)
duration = models.FloatField('持续时间(h)', null=True, blank=True)
cate = models.CharField('原因类别', max_length=10, null=True, blank=True) cate = models.CharField('原因类别', max_length=10, null=True, blank=True)
reason = models.TextField('事件原因', default='', max_length=100) reason = models.TextField('事件原因', default='', max_length=100)
measure = models.TextField('处置措施', default='', max_length=100) measure = models.TextField('处置措施', default='', max_length=100)
@ -82,7 +78,6 @@ class SfLogExp(CommonADModel):
SfLog, on_delete=models.CASCADE, verbose_name='关联值班记录') SfLog, on_delete=models.CASCADE, verbose_name='关联值班记录')
stlog = models.ForeignKey( stlog = models.ForeignKey(
StLog, verbose_name='关联异常记录', on_delete=models.CASCADE) StLog, verbose_name='关联异常记录', on_delete=models.CASCADE)
duration = models.FloatField('持续时长(h)', null=True, blank=True)
duration_sec = models.PositiveIntegerField('持续时长(s)', null=True, blank=True) duration_sec = models.PositiveIntegerField('持续时长(s)', null=True, blank=True)
note = models.TextField('处理备注', default='', blank=True) note = models.TextField('处理备注', default='', blank=True)