优化修改传感器接口，新增传感器长地址字段。

Controller/SensorGateway/GatewayDeviceController.py

@@ -203,7 +203,7 @@ class GatewayDeviceView(View):
                         'id', 'device_type',
                         'nickname',
                         'src_addr', 'status',
-                        'created_time', )
+                        'created_time', 'ieee_addr')
                     room_id = item['room_id']
                     room_qs = FamilyRoom.objects.filter(id=room_id)
                     gateway_room_name = room_qs.first().name if room_qs.exists() else ''
@@ -215,7 +215,8 @@ class GatewayDeviceView(View):
                         'srcAddr': gateway_sub_qs['src_addr'],
                         'status': gateway_sub_qs['status'],
                         'createdTime': gateway_sub_qs['created_time'],
-                        'roomName': gateway_room_name
+                        'roomName': gateway_room_name,
+                        'ieeeAddr': gateway_sub_qs['ieee_addr']
                     })
             return response.json(0, {'gateway': gateway, 'sub_device': sub_device})
 

Controller/SensorGateway/SubDeviceController.py

@@ -27,20 +27,19 @@ class GatewaySubDeviceView(View):
         return self.validation(request.POST, request, operation)
 
     def validation(self, request_dict, request, operation):
-        token = TokenObject(request.META.get('HTTP_AUTHORIZATION'))
+        token_obj = TokenObject(request.META.get('HTTP_AUTHORIZATION'))
         lang = request_dict.get('lang', None)
-        response = ResponseObject(lang) if lang else ResponseObject(token.lang)
+        response = ResponseObject(lang if lang else token_obj.lang)
 
-        # if token.code != 0:
-        #     return response.json(token.code)
-        # user_id = token.userID
-        user_id = '154700384179113800138000'
+        if token_obj.code != 0:
+            return response.json(token_obj.code)
+        user_id = token_obj.userID
         if operation == 'add':  # 添加子设备
             return self.add(request_dict, user_id, response)
         elif operation == 'query':  # 查询子设备
             return self.query(request_dict, user_id, response)
         elif operation == 'update':  # 更新子设备信息
-            return self.update(request_dict, user_id, response)
+            return self.sensor_update(user_id, request_dict, response)
         elif operation == 'delete':  # 删除子设备
             return self.delete(request_dict, user_id, response)
         else:
@@ -64,6 +63,7 @@ class GatewaySubDeviceView(View):
         serial_number = request_dict.get('serial_number', None)
         device_type = int(request_dict.get('device_type', None))
         nickname = request_dict.get('nickname', None)
+        request_dict.get('ieee_addr', None)
         src_addr = request_dict.get('src_addr', None)
         family_id = request_dict.get('family_id', None)
         room_id = request_dict.get('room_id', None)
@@ -118,39 +118,41 @@ class GatewaySubDeviceView(View):
         except Exception as e:
             return response.json(500, repr(e))
 
-    @staticmethod
-    def update(request_dict, user_id, response):
+    @classmethod
+    def sensor_update(cls, user_id, request_dict, response):
         """
-        更新子设备信息
+        传感器修改
+        @param user_id: 登录用户id
         @param request_dict: 请求参数
-        @request_dict serial_number: 序列号
-        @request_dict sub_device_id: 子设备id
-        @param user_id: 用户id
-        @param response: 响应对象
-        @return: response
+        @param response: 响应结果
+        @return: list
         """
-        serial_number = request_dict.get('serial_number', None)
-        sub_device_id = request_dict.get('sub_device_id', None)
-        nickname = request_dict.get('nickname', None)
-        src_addr = request_dict.get('src_addr', None)
-        status = int(request_dict.get('status', None))
-        family_id = request_dict.get('family_id', None)
-        room_id = request_dict.get('room_id', None)
-
-        if not all([serial_number]):
+        serial_number = request_dict.get('serialNumber', None)
+        nickName = request_dict.get('nickName', None)
+        gateway_sub_id = request_dict.get('gatewaySubId', None)
+        family_id = request_dict.get('familyId', None)
+        room_id = request_dict.get('roomId', None)
+        if not all([serial_number, gateway_sub_id]):
             return response.json(444)
         try:
+            gateway_sub_id = int(gateway_sub_id)
             device_info_qs = Device_Info.objects.filter(userID_id=user_id, serial_number=serial_number).values('id')
             if not device_info_qs.exists():
                 return response.json(14)
-            update_data = {
-                'nickname': nickname,
-                'src_addr': src_addr,
-                'status': status,
-            }
-            GatewaySubDevice.objects.filter(id=sub_device_id).update(**update_data)
+            gateway_sub_qs = GatewaySubDevice.objects.filter(id=gateway_sub_id)
+            if not gateway_sub_qs.exists():
+                return response.json(173)
+            if nickName:
+                gateway_sub_qs.update(nickname=nickName)
+                return response.json(0)
+            elif all([family_id, room_id]):
+                device_id = device_info_qs.first()['id']
+                room_id = int(room_id)
+                FamilyRoomDevice.objects.filter(device_id=device_id, sub_device=gateway_sub_id) \
+                    .update(room_id=room_id)
             return response.json(0)
         except Exception as e:
+            print(e.args)
             return response.json(500, repr(e))
 
     @staticmethod
@@ -172,4 +174,3 @@ class GatewaySubDeviceView(View):
             return response.json(0)
         except Exception as e:
             return response.json(500, repr(e))
-

Model/models.py

@@ -2518,6 +2518,7 @@ class GatewaySubDevice(models.Model):
                                verbose_name='关联设备信息id')
     device_type = models.SmallIntegerField(default=0, verbose_name=u'设备类型')
     nickname = models.CharField(default='', max_length=32, verbose_name=u'设备名称')
+    ieee_addr = models.CharField(default='', max_length=64, verbose_name=u'长地址')
     src_addr = models.CharField(default='', max_length=16, verbose_name=u'短地址')
     status = models.SmallIntegerField(default=0, verbose_name='状态')  # 0:关闭, 1:开启
     created_time = models.IntegerField(default=0, verbose_name='创建时间')