新增Uidset时 新增设备地区

Controller/AiController.py

@@ -163,6 +163,7 @@ class AiView(View):
                     'uid': uid,
                     'addTime': nowTime,
                     'updTime': nowTime,
+                    'device_type': device_info_qs[0].Type
                 }
                 if interval:
                     qs_data['detect_interval'] = int(interval)

Controller/DetectController.py

@@ -222,6 +222,7 @@ class DetectControllerView(View):
         nowTime = int(time.time())
         if dvqs.exists():
             # 修改状态
+            device_type = dvqs[0].Type
             dvqs.update(NotificationMode=status)
             uid_set_qs = UidSetModel.objects.filter(uid=uid)
             # uid配置信息是否存在
@@ -245,6 +246,7 @@ class DetectControllerView(View):
                     'addTime': nowTime,
                     'updTime': nowTime,
                     'detect_status': status,
+                    'device_type': device_type
                 }
                 if interval:
                     qs_data['detect_interval'] = int(interval)

Controller/DetectControllerV2.py

@@ -142,7 +142,9 @@ class DetectControllerViewV2(View):
 
             # 更新或创建uid_set数据
             nowTime = int(time.time())
-            uid_set_data = {}
+            uid_set_data = {
+                'device_type': device_info_qs[0].Type
+            }
 
             # 设置开关状态,0:关闭,1:开启
             if status:

Controller/EquipmentManager.py

@@ -254,6 +254,7 @@ def modifyUserEquipmentInterface(request):
                     'ip': CommonService.get_ip_address(request),
                     'channel': ChannelIndex,
                     'nickname': nickname,
+                    'device_type': qs[0].Type
                 }
                 UidSetModel.objects.create(**uid_set_create_dict)
             Device_Info.objects.filter(UID=uid).update(NickName=nickname)
@@ -415,7 +416,7 @@ def addInterface(request):
                 isShare = False
 
                 is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'primaryUserID',
-                                                                                    'primaryMaster')
+                                                                                    'primaryMaster', 'Type')
 
                 if main_exist.exists():
                     vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
@@ -478,6 +479,7 @@ def addInterface(request):
                             'channel': ChannelIndex,
                             'nickname': NickName,
                             'version': version,
+                            'device_type': is_bind[0]['Type']
                         }
                         UidSetModel.objects.create(**uid_set_create_dict)
                     else:
@@ -1245,6 +1247,7 @@ def update_uid_set(request):
                     'updTime': nowTime,
                     'version': version,
                     'ucode': ucode,
+                    'device_type': dvqs[0].Type
                 }
                 UidSetModel.objects.create(**uid_set_create_dict)
             return response.json(0)

Controller/EquipmentManagerV2.py

@@ -85,6 +85,7 @@ class EquipmentManagerV2(View):
                                 'ip': CommonService.get_ip_address(request),
                                 'channel': ChannelIndex,
                                 'nickname': NickName,
+                                'device_type': Type
                             }
                             UidSetModel.objects.create(**uid_set_create_dict)
                         else:

Controller/EquipmentManagerV3.py

@@ -351,7 +351,7 @@ class EquipmentManagerV3(View):
                 isShare = False
 
                 is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'primaryUserID',
-                                                                                    'primaryMaster')
+                                                                                    'primaryMaster', 'Type')
 
                 if main_exist.exists():
                     vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
@@ -420,6 +420,7 @@ class EquipmentManagerV3(View):
                         'nickname': NickName,
                         'version': version,
                         'region_alexa': region_alexa,
+                        'device_type': is_bind[0]['Type']
                     }
                     UidSet = UidSetModel.objects.create(**uid_set_create_dict)
                     UidSet_id = UidSet.id
@@ -564,6 +565,7 @@ class EquipmentManagerV3(View):
                         # 'ip': CommonService.get_ip_address(request),
                         'channel': ChannelIndex,
                         'nickname': nickname,
+                        'device_type': qs[0].Type
                     }
                     UidSetModel.objects.create(**uid_set_create_dict)
                 di_qs = Device_Info.objects.filter(UID=uid)

Controller/MessagePush/EquipmentMessagePush.py

@@ -13,7 +13,7 @@ import time
 from django.db import transaction
 from django.views.generic.base import View
 
-from Model.models import AiService, UidSetModel
+from Model.models import AiService, UidSetModel, Device_Info
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -80,11 +80,13 @@ class EquipmentMessagePushView(View):
                 n_time = int(time.time())
                 status = int(status)
                 uid_set_qs = UidSetModel.objects.filter(uid=uid)
+                device_qs = Device_Info.objects.filter(UID=uid)
                 if not uid_set_qs.exists():
                     qs_data = {
                         'uid': uid,
                         'addTime': n_time,
                         'updTime': n_time,
+                        'device_type': device_qs[0].Type if device_qs.exists() else 0
                     }
                     if interval:
                         qs_data['new_detect_interval'] = int(interval)

Controller/UidSetController.py

@@ -347,6 +347,7 @@ class UidSetView(View):
                         'ip': CommonService.get_ip_address(request),
                         'channel': di.ChannelIndex,
                         'nickname': di.NickName,
+                        'device_type': di.Type
                     }
                     for k, v in deviceData.items():
                         uid_set_create_dict[k] = v

Controller/UidUser.py

@@ -87,7 +87,9 @@ def addInterface(request):
                                 'updTime': nowTime,
                                 'ip': CommonService.get_ip_address(request),
                                 'channel': ChannelIndex,
-                                'nickname': NickName}
+                                'nickname': NickName,
+                                'device_type': Type
+                            }
                             UidSetModel.objects.create(**uid_set_create_dict)
                     except Exception as e:
                         return response.json(10, repr(e))
@@ -436,7 +438,9 @@ def v3addInterface(request):
                                 'updTime': nowTime,
                                 'ip': CommonService.get_ip_address(request),
                                 'channel': ChannelIndex,
-                                'nickname': NickName}
+                                'nickname': NickName,
+                                'device_type': Type
+                            }
                             UidSetModel.objects.create(**uid_set_create_dict)
                     except Exception as e:
                         return response.json(10, repr(e))