diff --git a/apps/mosquito/tasks.py b/apps/mosquito/tasks.py index dcdda16..3e0f68f 100644 --- a/apps/mosquito/tasks.py +++ b/apps/mosquito/tasks.py @@ -201,15 +201,23 @@ def update_mosq_device_info(): default_org = Org.objects.all().first() for device_id in delta: counter_device = DeviceCount.objects.filter(device_id=device_id).order_by('-data_time').first() + # 设备上报了信息 + if counter_device: + latitude = counter_device.latitude + longitude = counter_device.longitude + else: + latitude = None + longitude = None + DeviceInfo.objects.create(device_id=device_id, org=default_org, - latitude=counter_device.latitude, - longitude=counter_device.longitude) + latitude=latitude, + longitude=longitude) return list(delta) if __name__ == '__main__': # a, b = get_daily_statistic() # print(a, b) - # update_mosq_device_info() - update_mosql_device_location() + update_mosq_device_info() + # update_mosql_device_location() diff --git a/mosqkiller/settings.py b/mosqkiller/settings.py index 2f09cec..194775a 100644 --- a/mosqkiller/settings.py +++ b/mosqkiller/settings.py @@ -217,10 +217,10 @@ CELERY_BEAT_SCHEDULE = { 'task': 'mosquito.tasks.update_mosq_device_info', 'schedule': crontab(minute="*/5"), }, - # 'update-latest-statistic': { - # 'task': 'mosquito.tasks.update_latest_statistic', - # 'schedule': crontab(hour='*/1', minute=0), - # }, + 'update-latest-statistic': { + 'task': 'mosquito.tasks.update_mosql_device_location', + 'schedule': crontab(hour='*/2', minute=0), + }, } # logging db query