locky 3 роки тому
батько
коміт
4ec3955a57
1 змінених файлів з 19 додано та 17 видалено
  1. 19 17
      Model/models.py

+ 19 - 17
Model/models.py

@@ -2476,12 +2476,31 @@ class FamilyRoom(models.Model):
         verbose_name_plural = verbose_name
 
 
+class GatewaySubDevice(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
+    device = models.ForeignKey(Device_Info, to_field='id', default='', on_delete=models.CASCADE,
+                               verbose_name='关联设备信息id')
+    device_type = models.SmallIntegerField(default=0, verbose_name=u'设备类型')
+    nickname = models.CharField(default='', max_length=32, 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='创建时间')
+    updated_time = models.IntegerField(default=0, verbose_name='更新时间')
+
+    class Meta:
+        db_table = 'gateway_sub_device'
+        verbose_name = '网关子设备'
+        verbose_name_plural = verbose_name
+
+
 class FamilyRoomDevice(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     room_id = models.IntegerField(default=0, blank=True, verbose_name=u'房间id')
     family_id = models.IntegerField(default=0, blank=True, verbose_name=u'家庭id')
     device = models.ForeignKey(Device_Info, to_field='id', default='', on_delete=models.CASCADE,
                                verbose_name='关联设备信息id')
+    sub_device = models.ForeignKey(GatewaySubDevice, to_field='id', default='', on_delete=models.CASCADE,
+                                   verbose_name='关联子设备信息id')
     sort = models.IntegerField(default=0, blank=True, verbose_name=u'排序,越小越靠前')
     updated_time = models.IntegerField(default=0, verbose_name='更新时间')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
@@ -2507,20 +2526,3 @@ class FamilyMemberJoin(models.Model):
         verbose_name = '家庭成员加入'
         verbose_name_plural = verbose_name
 
-
-class GatewaySubDevice(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    device = models.ForeignKey(Device_Info, to_field='id', default='', on_delete=models.CASCADE,
-                               verbose_name='关联设备信息id')
-    device_type = models.SmallIntegerField(default=0, verbose_name=u'设备类型')
-    nickname = models.CharField(default='', max_length=32, verbose_name=u'设备名称')
-    src_addr = models.CharField(default='', max_length=16, verbose_name=u'短地址')
-    status = models.SmallIntegerField(default=0, verbose_name='状态')     # 0:关闭, 1:开启
-    updated_time = models.IntegerField(default=0, verbose_name='更新时间')
-    created_time = models.IntegerField(default=0, verbose_name='创建时间')
-
-    class Meta:
-        db_table = 'gateway_sub_device'
-        verbose_name = '网关子设备'
-        verbose_name_plural = verbose_name
-