Browse Source

Revert "更新插座不更新地区"

This reverts commit 5b1cd6b4b531eebf8976cb8263bd25bb77dad5d7.
peng 2 years ago
parent
commit
dbbea924f3
1 changed files with 7 additions and 3 deletions
  1. 7 3
      Controller/SensorGateway/GatewayDeviceController.py

+ 7 - 3
Controller/SensorGateway/GatewayDeviceController.py

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