瀏覽代碼

加上传感器序列号

locky 3 年之前
父節點
當前提交
f15ae32f30
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      Controller/SensorGateway/SubDeviceController.py
  2. 2 1
      Model/models.py

+ 2 - 1
Controller/SensorGateway/SubDeviceController.py

@@ -82,6 +82,7 @@ class GatewaySubDeviceView(View):
         mac = request_dict.get('mac', '')
         device_model = request_dict.get('deviceModel', '')
         manufacturer = request_dict.get('manufacturer', '')
+        sensor_serial = request_dict.get('sensorSerial', '')
         firmware_version = request_dict.get('firmwareVersion', '')
         hardware_version = request_dict.get('hardwareVersion', '')
 
@@ -106,7 +107,7 @@ class GatewaySubDeviceView(View):
                 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, mac=mac, device_model=device_model,
-                                                             manufacturer=manufacturer,
+                                                             manufacturer=manufacturer, sensor_serial=sensor_serial,
                                                              firmware_version=firmware_version,
                                                              hardware_version=hardware_version,
                                                              created_time=now_time, updated_time=now_time)

+ 2 - 1
Model/models.py

@@ -2540,7 +2540,8 @@ class GatewaySubDevice(models.Model):
     is_tampered = models.SmallIntegerField(default=0, verbose_name='拆动状态')  # 0:正常, 1:被拆动
     mac = models.CharField(default='', max_length=32, verbose_name=u'mac地址')
     device_model = models.CharField(default='', max_length=16, verbose_name=u'设备型号')
-    manufacturer = models.CharField(default='', max_length=16, verbose_name=u'厂家名称')
+    manufacturer = models.CharField(default='', max_length=16, verbose_name=u'制造商')
+    sensor_serial = models.CharField(default='', max_length=32, verbose_name=u'传感器序列号')
     firmware_version = models.CharField(default='', max_length=32, verbose_name=u'固件版本')
     hardware_version = models.CharField(default='', max_length=32, verbose_name=u'硬件版本')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')