修改绑定序列号和用户id接口

Controller/SensorGateway/GatewayDeviceController.py

@@ -45,6 +45,10 @@ class GatewayDeviceView(View):
 
     def validation(self, request_dict, request, operation):
 
+        if operation == 'bind-serial-user':
+            response = ResponseObject()
+            return self.bind_serial_user(request_dict, response)
+
         token = TokenObject(request.META.get('HTTP_AUTHORIZATION'))
         lang = request_dict.get('lang', None)
         response = ResponseObject(lang) if lang else ResponseObject(token.lang)
@@ -63,8 +67,6 @@ class GatewayDeviceView(View):
             return self.my_family_list(user_id, response)
         elif operation == 'location-setting':
             return self.device_location_setting(user_id, request_dict, response)
-        elif operation == 'bind-serial-user':
-            return self.bind_serial_user(user_id, request_dict, response)
         elif operation == 'get-serial-user':
             return self.get_serial_user(user_id, request_dict, response)
 
@@ -461,17 +463,19 @@ class GatewayDeviceView(View):
         data['accumulatedTime'] = socket_power_qs[0]['accumulated_time']
         return data
 
-    @classmethod
-    def bind_serial_user(cls, user_id, request_dict, response):
+    @staticmethod
+    def bind_serial_user(request_dict, response):
         """
-        绑定网关序列号和用户id
-        @param user_id: 用户id
+        绑定序列号和用户id
         @param request_dict: 请求参数字典
+        @request_dict user_id: 用户id
+        @request_dict serial_number: 序列号
         @param response: 响应对象
         @return:
         """
-        serial_number = request_dict.get('serialNumber')
-        if not serial_number:
+        user_id = request_dict.get('user_id')
+        serial_number = request_dict.get('serial_number')
+        if not all([user_id, serial_number]):
             return response.json(444)
         try:
             redis_obj = RedisObject()
@@ -480,11 +484,10 @@ class GatewayDeviceView(View):
                 return response.json(178)
             return response.json(0)
         except Exception as e:
-            print(e)
-            return response.json(177, repr(e))
+            return response.json(500, repr(e))
 
-    @classmethod
-    def get_serial_user(cls, user_id, request_dict, response):
+    @staticmethod
+    def get_serial_user(user_id, request_dict, response):
         """
         获取用户id绑定网关序列号
         @param user_id: 用户id
@@ -499,8 +502,7 @@ class GatewayDeviceView(View):
                 return response.json(173)
             return response.json(0, {'serialNumber': serial_number})
         except Exception as e:
-            print(e)
-            return response.json(177, repr(e))
+            return response.json(500, repr(e))
 
     @classmethod
     def update_socket(cls, serial_number, device_name, user_id, region):