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

feat: enm/task 修改班时校正

This commit is contained in:
zty 2025-02-27 14:28:32 +08:00
parent bf35064f6e
commit ea5e041575
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/enm/tasks.py
View File

@ -492,6 +492,7 @@ def cal_mpointstat_manual(mpointId: str, sflogId: str, mgroupId: str, year: int,
start_cal_type = 'month_s' start_cal_type = 'month_s'
elif year_s: elif year_s:
start_cal_type = 'year_s' start_cal_type = 'year_s'
myLogger.info('--------开始计算能源数据统计----')
cal_enstat(start_cal_type, sflogId, mgroupId, year, month, day, hour, year_s, month_s, day_s) cal_enstat(start_cal_type, sflogId, mgroupId, year, month, day, hour, year_s, month_s, day_s)

10
apps/enm/views.py
View File

@ -194,6 +194,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
sr = MpointStatCorrectSerializer(data=request.data) sr = MpointStatCorrectSerializer(data=request.data)
sr.is_valid(raise_exception=True) sr.is_valid(raise_exception=True)
last_record = None last_record = None
# 校正班月和月的统计值
if instance.type in ['month_s', 'month']: if instance.type in ['month_s', 'month']:
last_record = MpointStat.objects.filter(mpoint=instance.mpoint, last_record = MpointStat.objects.filter(mpoint=instance.mpoint,
type=instance.type, type=instance.type,
@ -201,6 +202,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
year_s=instance.year_s, year_s=instance.year_s,
year = instance.year year = instance.year
).order_by(instance.type).values("id").last() ).order_by(instance.type).values("id").last()
# 校正班天和天的统计值
elif instance.type in ['day_s', 'day']: elif instance.type in ['day_s', 'day']:
last_record = MpointStat.objects.filter(mpoint=instance.mpoint, last_record = MpointStat.objects.filter(mpoint=instance.mpoint,
type=instance.type, type=instance.type,
@ -218,7 +220,10 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
instance.val = val_correct instance.val = val_correct
instance.update_by = request.user instance.update_by = request.user
instance.save() instance.save()
mpoint, sflog, mgroup, year_s, month_s, day_s, year, month, day = instance.mpoint, instance.sflog, instance.mgroup, instance.year_s, instance.month_s, instance.day_s, instance.year, instance.month, instance.day (mpoint, sflog, mgroup, year_s, month_s, day_s, year, month, day, hour) = (
instance.mpoint, instance.sflog, instance.mgroup,
instance.year_s, instance.month_s, instance.day_s, instance.hour,
instance.year, instance.month, instance.day)
# sflog 可能为None # sflog 可能为None
if sflog is None: if sflog is None:
sflogId = None sflogId = None
@ -228,7 +233,8 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
mgroupId = None mgroupId = None
else: else:
mgroupId = mgroup.id mgroupId = mgroup.id
cal_mpointstat_manual.delay(mpoint.id, sflogId, mgroupId, year, month, day, None, year_s, month_s, day_s, next_cal=1) myLogger.info(f'{mpoint.id}--{sflogId}--{mgroupId}--{year}--{month}--{day}--{hour}--{year_s}--{month_s}--{day_s}')
cal_mpointstat_manual.delay(mpoint.id, sflogId, mgroupId, year, month, day, hour, year_s, month_s, day_s, next_cal=1)
return Response() return Response()
@action(methods=["post"], detail=False, perms_map={"post": "mpointstat.correct"}, serializer_class=ReCalSerializer) @action(methods=["post"], detail=False, perms_map={"post": "mpointstat.correct"}, serializer_class=ReCalSerializer)