添加子设备增加参数

Controller/SensorGateway/SubDeviceController.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-@Author ： Joker
+@Author ： Rocky
 @Time ： 2022/5/25 15:17
 @File ：SubDeviceController.py
 """
@@ -37,7 +37,7 @@ class GatewaySubDeviceView(View):
             return response.json(token_obj.code)
         user_id = token_obj.userID
         if operation == 'add':  # 添加子设备
-            return self.add(request_dict, user_id, response)
+            return self.add_sub_device(request_dict, user_id, response)
         elif operation == 'query':  # 查询子设备
             return self.query(request_dict, user_id, response)
         elif operation == 'update':  # 更新子设备信息
@@ -54,16 +54,22 @@ class GatewaySubDeviceView(View):
             return response.json(414)
 
     @staticmethod
-    def add(request_dict, user_id, response):
+    def add_sub_device(request_dict, user_id, response):
         """
         添加子设备
         @param request_dict: 请求参数
-        @request_dict serial_number: 序列号
-        @request_dict device_type: 设备类型
-        @request_dict nickname: 设备名
-        @request_dict src_addr: 短地址
-        @request_dict family_id: 家庭id
-        @request_dict room_id: 房间id
+        @request_dict serialNumber: 序列号
+        @request_dict deviceType: 设备类型
+        @request_dict nickName: 设备名
+        @request_dict ieeeAddr: 长地址
+        @request_dict srcAddr: 短地址
+        @request_dict mac: mac地址
+        @request_dict deviceModel: 设备型号
+        @request_dict manufacturer: 厂家名称
+        @request_dict firmwareVersion: 固件版本
+        @request_dict hardwareVersion: 硬件版本
+        @request_dict familyId: 家庭id
+        @request_dict roomId: 房间id
         @param user_id: 用户id
         @param response: 响应对象
         @return: response 响应对象
@@ -73,6 +79,12 @@ class GatewaySubDeviceView(View):
         nickname = request_dict.get('nickName', None)
         ieee_addr = request_dict.get('ieeeAddr', None)
         src_addr = request_dict.get('srcAddr', None)
+        mac = request_dict.get('mac', '')
+        device_model = request_dict.get('deviceModel', '')
+        manufacturer = request_dict.get('manufacturer', '')
+        firmware_version = request_dict.get('firmwareVersion', '')
+        hardware_version = request_dict.get('hardwareVersion', '')
+
         family_id = request_dict.get('familyId', None)
         room_id = request_dict.get('roomId', 0)
 
@@ -93,7 +105,11 @@ class GatewaySubDeviceView(View):
             with transaction.atomic():
                 sub_device = GatewaySubDevice.objects.create(device_id=device_id, device_type=device_type,
                                                              nickname=nickname, ieee_addr=ieee_addr, src_addr=src_addr,
-                                                             status=1, created_time=now_time, updated_time=now_time)
+                                                             status=1, mac=mac, device_model=device_model,
+                                                             manufacturer=manufacturer,
+                                                             firmware_version=firmware_version,
+                                                             hardware_version=hardware_version,
+                                                             created_time=now_time, updated_time=now_time)
                 FamilyRoomDevice.objects.create(family_id=family_id, room_id=room_id, device_id=device_id,
                                                 sub_device=sub_device.id, created_time=now_time, updated_time=now_time)
             return response.json(0)