瀏覽代碼

equipment/add接口添加设备请求Alexa更新事件网关

locky 4 年之前
父節點
當前提交
9114a31b93
共有 1 個文件被更改,包括 23 次插入9 次删除
  1. 23 9
      Controller/EquipmentManager.py

+ 23 - 9
Controller/EquipmentManager.py

@@ -8,7 +8,7 @@ import requests
 import simplejson as json
 import simplejson as json
 from django.utils import timezone
 from django.utils import timezone
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, \
 from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, \
-    UIDCompanySerialModel, iotdeviceInfoModel, UIDMainUser
+    UIDCompanySerialModel, iotdeviceInfoModel, UIDMainUser, UidChannelSetModel
 from django.db.models import Q
 from django.db.models import Q
 from Object.ResponseObject import ResponseObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.TokenObject import TokenObject
@@ -484,14 +484,28 @@ def addInterface(request):
                     else:
                     else:
                         Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
                         Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
                                                                    vodPrimaryMaster=vodPrimaryMaster)
                                                                    vodPrimaryMaster=vodPrimaryMaster)
-                    # if isCheckMainUser == '1':
-                    #     uid_main_dict = {
-                    #         'UID': UID,
-                    #         'user_id': vodPrimaryUserID
-                    #     }
-                    #     UIDMainUser.objects.create(**uid_main_dict)
-                # redisObj = RedisObject(db=8)
-                    # redisObj.del_data(key='uid_qs_' + userID)
+                    if not us_qs.exists():
+                        us_qs = UidSetModel.objects.filter(uid=UID)
+
+                    if us_qs.exists() and us_qs[0].is_alexa == 1:
+                        if us_qs[0].channel > 1:
+                            data_list = []
+                            uid_channel_set_qs = UidChannelSetModel.objects.filter(uid_id=us_qs[0].id). \
+                                values('channel', 'channel_name')
+                            if uid_channel_set_qs.exists():
+                                # 多通道设备名为 UidChannelSetModel 的 channel_name
+                                for uid_channel_set in uid_channel_set_qs:
+                                    data_list.append(
+                                        {'userID': userID, 'UID': UID, 'uid_nick': uid_channel_set['channel_name'],
+                                         'channel': uid_channel_set['channel'], 'password': View_Password})
+                        else:
+                            data_list = [{'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': View_Password}]
+
+                        # 请求Alexa服务器更新事件网关
+                        data_list = json.dumps(data_list)
+                        data = {'data_list': data_list}
+                        url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateV2'
+                        requests.post(url, data=data, timeout=2)
                 except Exception as e:
                 except Exception as e:
                     return response.json(10, repr(e))
                     return response.json(10, repr(e))
                 else:
                 else: