|
|
@@ -50,24 +50,9 @@ class DeviceDataView(View):
|
|
|
return self.golbal_active(request, request_dict, response)
|
|
|
if operation == 'global/addDevice': # 全球新增设备数据
|
|
|
return self.golbal_add_device(request, request_dict, response)
|
|
|
-
|
|
|
- if operation == 'ip/country': #
|
|
|
- return self.ip_country(response)
|
|
|
else:
|
|
|
return response.json(414)
|
|
|
|
|
|
- @staticmethod
|
|
|
- def ip_country(response):
|
|
|
- uid_set_qs = UidSetModel.objects.filter(~Q(ip='') & Q(tb_country=0)).values('ip')
|
|
|
- for uid_set in uid_set_qs:
|
|
|
- ip = uid_set['ip']
|
|
|
- ipInfo = CommonService.getIpIpInfo(ip, 'CN')
|
|
|
- country_qs = CountryModel.objects.filter(country_code=ipInfo['country_code']).values('id')
|
|
|
- if country_qs.exists():
|
|
|
- country = country_qs[0]['id']
|
|
|
- uid_set_qs.filter(ip=ip).update(tb_country=country)
|
|
|
- return response.json(0)
|
|
|
-
|
|
|
@classmethod
|
|
|
def golbal_add_device(cls, request, request_dict, response):
|
|
|
"""
|
|
|
@@ -536,7 +521,7 @@ class DeviceDataView(View):
|
|
|
for continent, count in continent_dict.items():
|
|
|
rate = round(count / country_count * 100, 2) if country_count else 0
|
|
|
continent_list.append({
|
|
|
- 'countryName': continent,
|
|
|
+ 'continentName': continent,
|
|
|
'count': count,
|
|
|
'rate': rate
|
|
|
})
|
