新增设备：ip转换成地区

Controller/EquipmentManagerV3.py

@@ -14,7 +14,7 @@ from Controller.CheckUserData import RandomStr
 from Controller.DeviceConfirmRegion import Device_Region
 from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
-    Device_User, iotdeviceInfoModel, UIDCompanySerialModel, UIDModel, UnicomDeviceInfo
+    Device_User, iotdeviceInfoModel, UIDCompanySerialModel, UIDModel, UnicomDeviceInfo, CountryModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -173,6 +173,12 @@ class EquipmentManagerV3(View):
                 UidSet_id = us_qs.first().id
             else:
                 ip = CommonService.get_ip_address(request)
+                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']
+                else:
+                    country = '0'
                 region_id = Device_Region().get_device_region(ip)
                 region_alexa = 'CN' if region_id == 1 else 'ALL'
                 uid_set_create_dict = {
@@ -185,6 +191,7 @@ class EquipmentManagerV3(View):
                     'version': version,
                     'region_alexa': region_alexa,
                     'device_type': Type,
+                    'tb_country': country
                 }
                 UidSet = UidSetModel.objects.create(**uid_set_create_dict)
                 UidSet_id = UidSet.id

Controller/SensorGateway/EquipmentFamilyController.py

@@ -19,7 +19,7 @@ from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Controller.DeviceConfirmRegion import Device_Region
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
     iotdeviceInfoModel, UIDModel, Device_User, UserFamily, FamilyMember, FamilyMemberPermission, \
-    FamilyRoomDevice, FamilyRoom, FamilyMemberJoin, GatewaySubDevice
+    FamilyRoomDevice, FamilyRoom, FamilyMemberJoin, GatewaySubDevice, CountryModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -197,6 +197,12 @@ class EquipmentFamilyView(View):
                 if not us_qs:
                     n_time = int(time.time())
                     ip = CommonService.get_ip_address(request)
+                    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']
+                    else:
+                        country = '0'
                     region_id = Device_Region().get_device_region(ip)
                     region_alexa = 'CN' if region_id == 1 else 'ALL'
                     uid_set_create_dict = {
@@ -206,7 +212,8 @@ class EquipmentFamilyView(View):
                         'ip': CommonService.get_ip_address(request_dict),
                         'nickname': nick_name,
                         'region_alexa': region_alexa,
-                        'device_type': device_type
+                        'device_type': device_type,
+                        'td_country': country
                     }
                     UidSetModel.objects.create(**uid_set_create_dict)
                 return response.json(0)