fix: if hour改为if hour is not None

This commit is contained in:
caoqianming 2023-08-15 15:49:35 +08:00
parent fba349191c
commit 2c8a86d6f5
1 changed files with 2 additions and 2 deletions

View File

@ -141,7 +141,7 @@ def cal_mpointstats(is_now=1, year=None, month=None, day=None, hour=None):
""" """
计算所有自动采集测点的统计值默认当前小时, 可手动传入时间 计算所有自动采集测点的统计值默认当前小时, 可手动传入时间
""" """
if year and month and day and hour: if year and month and day and hour is not None:
pass pass
else: else:
now, pre = get_current_and_previous_time() now, pre = get_current_and_previous_time()
@ -235,7 +235,7 @@ def cal_enstat(type, sflogId, mgroupId, year, month, day, hour, year_s, month_s,
mgroup = Mgroup.objects.get(id=mgroupId) mgroup = Mgroup.objects.get(id=mgroupId)
if sflogId: if sflogId:
sflog = SfLog.objects.get(id=sflogId) sflog = SfLog.objects.get(id=sflogId)
elif year and month and day and hour: elif year and month and day and hour is not None:
mytz = tz.gettz(settings.TIME_ZONE) mytz = tz.gettz(settings.TIME_ZONE)
dt = datetime.datetime(year=year, month=month, day=day, hour=hour, tzinfo=mytz) dt = datetime.datetime(year=year, month=month, day=day, hour=hour, tzinfo=mytz)
sflog = SfLog.objects.get(start_time__lt=dt, end_time__gte=dt, mgroup=mgroup) sflog = SfLog.objects.get(start_time__lt=dt, end_time__gte=dt, mgroup=mgroup)