添加插座主动上报alexa

Controller/SensorGateway/EquipmentFamilyController.py

@@ -17,7 +17,6 @@ from django.views.generic.base import View
 
 from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Controller.DeviceConfirmRegion import Device_Region
-from Controller.SensorGateway.GatewayDeviceController import GatewayDeviceView
 from Controller.SensorGateway.SmartSocketController import SmartSocketView
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
     iotdeviceInfoModel, UIDModel, Device_User, UserFamily, FamilyMember, FamilyMemberPermission, \
@@ -221,9 +220,9 @@ class EquipmentFamilyView(View):
                     UidSetModel.objects.create(**uid_set_create_dict)
                 if int(device_type) == 201:  # 添加插座信息
                     SmartSocketView.save_socket_switch(device_id, serial_number, 0)
-                    GatewayDeviceView.update_socket(serial_number=device_info_qs[0]['serial_number'],
-                                                    device_name=nick_name,
-                                                    user_id=user_id)
+                    SmartSocketView.update_socket(serial_number=serial_number,
+                                                  device_name=nick_name,
+                                                  user_id=user_id)
                 if int(device_type) == 202:  # 添加开关信息
                     SwitchDimmingSettings.objects.create(device_id=device_id)
                 res = {

Controller/SensorGateway/GatewayDeviceController.py

@@ -138,8 +138,8 @@ class GatewayDeviceView(View):
                 uid_set_qs.update(nickname=device_name)
             if device_info_qs[0].Type == 201:
                 device_info_qs = device_info_qs.values('serial_number')
-                cls.update_socket(serial_number=device_info_qs[0]['serial_number'], device_name=device_name,
-                                  user_id=user_id)
+                SmartSocketView.update_socket(serial_number=device_info_qs[0]['serial_number'], device_name=device_name,
+                                              user_id=user_id)
         return response.json(0)
 
     @classmethod
@@ -575,7 +575,8 @@ class GatewayDeviceView(View):
                 if gateway_qs.exists():
                     sub_id_list = gateway_qs.values_list('id', flat=True)
                     SensorRecord.objects.filter(gateway_sub_device_id__in=list(sub_id_list)).delete()
-                    SmartScene.objects.filter(Q(device_id__in=device_id_list) | Q(sub_device_id__in=sub_id_list)).delete()
+                    SmartScene.objects.filter(
+                        Q(device_id__in=device_id_list) | Q(sub_device_id__in=sub_id_list)).delete()
                 else:
                     SmartScene.objects.filter(device_id__in=device_id_list).delete()
 
@@ -589,26 +590,6 @@ class GatewayDeviceView(View):
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
-    @classmethod
-    def update_socket(cls, serial_number, device_name, user_id):
-        url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateSwitch'
-        try:
-            region_id = CommonService.confirm_region_id()
-            data = {
-                'nick_name': device_name,
-                'serial_number': serial_number,
-                'user_id': user_id,
-            }
-            if region_id == 3:
-                data['region'] = 'US'
-            elif region_id == 4:
-                data['region'] = 'EU'
-            elif region_id == 5:
-                data['region'] = 'CN'
-            requests.post(url=url, data=data, timeout=5)
-        except Exception as e:
-            print(repr(e))
-
 
 #
 #                   ___====-_  _-====___

Controller/SensorGateway/SmartSocketController.py

@@ -930,3 +930,23 @@ class SmartSocketView(View):
             print(repr(e))
             LOGGER.info('---插座开关日志推送接口异常--- {}'.format(repr(e)))
             return response.json(500, repr(e))
+
+    @classmethod
+    def update_socket(cls, serial_number, device_name, user_id):
+        url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateSwitch'
+        try:
+            region_id = CommonService.confirm_region_id()
+            data = {
+                'nick_name': device_name,
+                'serial_number': serial_number,
+                'user_id': user_id,
+            }
+            if region_id == 3:
+                data['region'] = 'US'
+            elif region_id == 4:
+                data['region'] = 'EU'
+            elif region_id == 5:
+                data['region'] = 'CN'
+            requests.post(url=url, data=data, timeout=5)
+        except Exception as e:
+            print(repr(e))