chenjunkai 6 лет назад
Родитель
Сommit
41f4c6fa40
1 измененных файлов с 13 добавлено и 9 удалено
  1. 13 9
      Model/models.py

+ 13 - 9
Model/models.py

@@ -82,7 +82,7 @@ class Permissions(models.Model):
 
 
 class Role(models.Model):
 class Role(models.Model):
     rid = models.SmallIntegerField(primary_key=True, unique=True, verbose_name=u'用户角色组ID')
     rid = models.SmallIntegerField(primary_key=True, unique=True, verbose_name=u'用户角色组ID')
-    roleName = models.CharField(max_length=32,unique=True,
+    roleName = models.CharField(max_length=32, unique=True,
                                 default='User', verbose_name=u'角色名称')
                                 default='User', verbose_name=u'角色名称')
     permission = models.ManyToManyField(to='Permissions', blank=True, verbose_name=u'权限', db_table='role_permissions')
     permission = models.ManyToManyField(to='Permissions', blank=True, verbose_name=u'权限', db_table='role_permissions')
     Description = models.TextField(blank=True, default='', verbose_name=u'描述信息')
     Description = models.TextField(blank=True, default='', verbose_name=u'描述信息')
@@ -276,6 +276,7 @@ class Device_Info(models.Model):
     MirrorType = models.IntegerField(blank=True, default=0, verbose_name=u'镜像类型 0:关闭镜像,1:上下镜像,2:左右镜像,3:上下左右镜像')
     MirrorType = models.IntegerField(blank=True, default=0, verbose_name=u'镜像类型 0:关闭镜像,1:上下镜像,2:左右镜像,3:上下左右镜像')
     RecordType = models.IntegerField(blank=True, default=0, verbose_name=u'录像模式(0:关闭,1:全是录像,3:报警录像)')
     RecordType = models.IntegerField(blank=True, default=0, verbose_name=u'录像模式(0:关闭,1:全是录像,3:报警录像)')
     TimeZone = models.CharField(blank=True, max_length=50, default='', verbose_name=u'时区')
     TimeZone = models.CharField(blank=True, max_length=50, default='', verbose_name=u'时区')
+    isVod = models.SmallIntegerField(blank=True, default=0, verbose_name='是否支持云存')
     ###
     ###
     REQUIRED_FIELDS = []
     REQUIRED_FIELDS = []
 
 
@@ -401,9 +402,9 @@ class VodBucketModel(models.Model):
     bucket = models.CharField(max_length=30, verbose_name='设备UID')
     bucket = models.CharField(max_length=30, verbose_name='设备UID')
     storeDay = models.IntegerField(default=0, verbose_name='存储生命周期(天)')
     storeDay = models.IntegerField(default=0, verbose_name='存储生命周期(天)')
     content = models.TextField(verbose_name='描述')
     content = models.TextField(verbose_name='描述')
-    endpoint = models.CharField(max_length=125,default='', verbose_name='存储节点')
-    area = models.CharField(max_length=16,default='', verbose_name='区域')
-    region = models.CharField(max_length=16,default='', verbose_name='regionID')
+    endpoint = models.CharField(max_length=125, default='', verbose_name='存储节点')
+    area = models.CharField(max_length=16, default='', verbose_name='区域')
+    region = models.CharField(max_length=16, default='', verbose_name='regionID')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
 
@@ -426,7 +427,8 @@ class Store_Meal(models.Model):
     content = models.TextField(blank=True, null=True, verbose_name=u'描述')
     content = models.TextField(blank=True, null=True, verbose_name=u'描述')
     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
-    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id',on_delete=models.CASCADE, default=1, verbose_name='存储空间')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
+                               verbose_name='存储空间')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id
@@ -545,7 +547,8 @@ class VodHlsModel(models.Model):
     time = models.IntegerField(verbose_name='播放列表名字时间戳', default=0)
     time = models.IntegerField(verbose_name='播放列表名字时间戳', default=0)
     endTime = models.IntegerField(verbose_name='删除时间', default=0)
     endTime = models.IntegerField(verbose_name='删除时间', default=0)
     sec = models.IntegerField(verbose_name='秒数', default=0)
     sec = models.IntegerField(verbose_name='秒数', default=0)
-    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id',on_delete=models.CASCADE, default=1, verbose_name='存储空间')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
+                               verbose_name='存储空间')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id
@@ -563,7 +566,8 @@ class OssCrdModel(models.Model):
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
     data = models.TextField(verbose_name='设备sts')
     data = models.TextField(verbose_name='设备sts')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
-    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id',on_delete=models.CASCADE, default=1, verbose_name='存储空间')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
+                               verbose_name='存储空间')
 
 
     def __str__(self):
     def __str__(self):
         return self.id
         return self.id
@@ -579,7 +583,7 @@ class UID_Bucket(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     uid = models.CharField(max_length=20, verbose_name='设备UID')
     uid = models.CharField(max_length=20, verbose_name='设备UID')
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
-    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id',on_delete=models.CASCADE, verbose_name='存储空间')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
     status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
     status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
 
 
@@ -607,4 +611,4 @@ class UID_Bucket(models.Model):
 #         db_table = 'vod_user_sts'
 #         db_table = 'vod_user_sts'
 #         verbose_name = u'用户证书'
 #         verbose_name = u'用户证书'
 #         verbose_name_plural = verbose_name
 #         verbose_name_plural = verbose_name
-#         ordering = ('-id',)
+#         ordering = ('-id',)