浏览代码

更新插座不更新地区

peng 2 年之前
父节点
当前提交
5b1cd6b4b5
共有 1 个文件被更改,包括 3 次插入7 次删除
  1. 3 7
      Controller/SensorGateway/GatewayDeviceController.py

+ 3 - 7
Controller/SensorGateway/GatewayDeviceController.py

@@ -128,10 +128,8 @@ class GatewayDeviceView(View):
             if uid_set_qs.exists():
                 uid_set_qs.update(nickname=device_name)
             if device_info_qs[0].Type == 201:
-                device_info_qs = device_info_qs.values('userID__region_country', 'serial_number')
-                region = device_info_qs[0]['userID__region_country']
-                cls.update_socket(serial_number=device_info_qs[0]['serial_number'], device_name=device_name,
-                                  user_id=user_id, region=region)
+                cls.update_socket(serial_number=device_info_qs[0].serial_number, device_name=device_name,
+                                  user_id=user_id)
         return response.json(0)
 
     @classmethod
@@ -503,15 +501,13 @@ class GatewayDeviceView(View):
             return response.json(177, repr(e))
 
     @classmethod
-    def update_socket(cls, serial_number, device_name, user_id, region):
+    def update_socket(cls, serial_number, device_name, user_id):
         url = 'https://www.zositech.xyz/deviceStatus/addOrUpdateSwitch'
         try:
-            country_qs = CountryModel.objects.filter(id=region).values('region__continent_code')
             data = {
                 'nick_name': device_name,
                 'serial_number': serial_number,
                 'user_id': user_id,
-                'region': country_qs[0]['region__continent_code'] if country_qs.exists() else 'EN'
             }
             requests.post(url=url, data=data, timeout=5)
         except Exception as e: