修改表名

Model/models.py

@@ -1,13 +1,14 @@
 from itertools import chain
+
 from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
 from django.db import models
-from django.utils import six, timezone
+from django.utils import six
+from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 from imagekit.models import ProcessedImageField
 from imagekit.processors import ResizeToFill
 
 from Ansjer.config import SERVER_DOMAIN
-from django.utils import timezone
 
 
 class PermissionsManager(models.Manager):
@@ -2378,7 +2379,7 @@ class PaypalWebHookEvent(models.Model):
         ordering = ('id',)
 
 
-class LoocamUserFamily(models.Model):
+class UserFamily(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     user = models.ForeignKey(Device_User, to_field='userID', default='', on_delete=models.CASCADE,
                              verbose_name='关联用户表ID')
@@ -2389,12 +2390,12 @@ class LoocamUserFamily(models.Model):
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_user_family'
+        db_table = 'user_family'
         verbose_name = '用户家庭'
         verbose_name_plural = verbose_name
 
 
-class LoocamFamilyMemberPermission(models.Model):
+class FamilyMemberPermission(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     no = models.CharField(max_length=10, unique=True, verbose_name='编号', default=0)
     name = models.CharField(max_length=50, verbose_name=u'权限名称', default='')
@@ -2404,47 +2405,47 @@ class LoocamFamilyMemberPermission(models.Model):
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_family_member_permission'
+        db_table = 'family_member_permission'
         verbose_name = '家庭成员权限'
         verbose_name_plural = verbose_name
 
 
-class LoocamFamilyMember(models.Model):
+class FamilyMember(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     user = models.ForeignKey(Device_User, to_field='userID', default='', on_delete=models.CASCADE,
                              verbose_name='关联用户表id')
     user_name = models.CharField(max_length=64, db_index=True, verbose_name=u'用户名', default='', blank=True)
-    family = models.ForeignKey(LoocamUserFamily, to_field='id', default='', on_delete=models.CASCADE,
+    family = models.ForeignKey(UserFamily, to_field='id', default='', on_delete=models.CASCADE,
                                verbose_name='关联用户家庭id')
     sort = models.IntegerField(default=99, blank=True, verbose_name=u'排序，越小越靠前')
     identity = models.SmallIntegerField(default=0, verbose_name='状态{0:普通成员,1:屋主}')
-    permission = models.ForeignKey(LoocamFamilyMemberPermission, to_field='id', default='', on_delete=models.CASCADE,
+    permission = models.ForeignKey(FamilyMemberPermission, to_field='id', default='', on_delete=models.CASCADE,
                                    verbose_name='关联用户家庭id')
     updated_time = models.IntegerField(default=0, db_index=True, verbose_name='更新时间')
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_family_member'
+        db_table = 'family_member'
         verbose_name = '家庭成员'
         verbose_name_plural = verbose_name
 
 
-class LoocamFamilyRoom(models.Model):
+class FamilyRoom(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     name = models.CharField(max_length=128, verbose_name=u'房间名称', default='', blank=True)
-    family = models.ForeignKey(LoocamUserFamily, to_field='id', default='', on_delete=models.CASCADE,
+    family = models.ForeignKey(UserFamily, to_field='id', default='', on_delete=models.CASCADE,
                                verbose_name='关联用户家庭id')
     sort = models.IntegerField(default=99, blank=True, verbose_name=u'排序，越小越靠前')
     updated_time = models.IntegerField(default=0, db_index=True, verbose_name='更新时间')
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_family_room'
+        db_table = 'family_room'
         verbose_name = '家庭房间'
         verbose_name_plural = verbose_name
 
 
-class LoocamFamilyRoomDevice(models.Model):
+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')
@@ -2455,22 +2456,22 @@ class LoocamFamilyRoomDevice(models.Model):
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_family_room_device'
+        db_table = 'family_room_device'
         verbose_name = '家庭房间关联设备'
         verbose_name_plural = verbose_name
 
 
-class LoocamFamilyMemberJoin(models.Model):
+class FamilyMemberJoin(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     user = models.ForeignKey(Device_User, to_field='userID', default='', on_delete=models.CASCADE,
                              verbose_name='关联用户表id')
-    family = models.ForeignKey(LoocamUserFamily, to_field='id', default='', on_delete=models.CASCADE,
+    family = models.ForeignKey(UserFamily, to_field='id', default='', on_delete=models.CASCADE,
                                verbose_name='关联用户家庭id')
     status = models.SmallIntegerField(default=0, verbose_name='状态{0:未确认,1:拒绝,2:同意}')
     updated_time = models.IntegerField(default=0, db_index=True, verbose_name='更新时间')
     created_time = models.IntegerField(default=0, db_index=True, verbose_name='创建时间')
 
     class Meta:
-        db_table = 'loocam_family_member_join'
+        db_table = 'family_member_join'
         verbose_name = '家庭成员加入'
         verbose_name_plural = verbose_name

SensorGateway/EquipmentFamilyController.py

@@ -18,8 +18,8 @@ from django.views.generic.base import View
 from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Controller.DeviceConfirmRegion import Device_Region
 from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidChannelSetModel, \
-    iotdeviceInfoModel, UIDModel, Device_User, LoocamUserFamily, LoocamFamilyMember, LoocamFamilyMemberPermission, \
-    LoocamFamilyRoomDevice, LoocamFamilyRoom
+    iotdeviceInfoModel, UIDModel, Device_User, UserFamily, FamilyMember, FamilyMemberPermission, \
+    FamilyRoomDevice, FamilyRoom
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
@@ -496,26 +496,26 @@ class EquipmentFamilyView(View):
         lang = request_dict.get('lang', 'cn')
         if user_id:
             with transaction.atomic():
-                user_family_qs = LoocamUserFamily.objects.filter(user_id=user_id)
+                user_family_qs = UserFamily.objects.filter(user_id=user_id)
                 if not user_family_qs.exists():
                     n_time = int(time.time())
                     device_user = Device_User.objects.get(userID=user_id)
                     # 创建默认家庭使用用户名或者邮箱作为名称
                     family_name = device_user.username if device_user.username else device_user.userEmail
                     family_name = family_name + "的家" if lang == 'cn' else family_name + " home"
-                    user_family = LoocamUserFamily.objects.create(user_id=user_id, name=family_name,
-                                                                  updated_time=n_time,
-                                                                  created_time=n_time)
+                    user_family = UserFamily.objects.create(user_id=user_id, name=family_name,
+                                                            updated_time=n_time,
+                                                            created_time=n_time)
                     if user_family.id:
-                        member_permission_qs = LoocamFamilyMemberPermission.objects.filter(no='001').values('id')
+                        member_permission_qs = FamilyMemberPermission.objects.filter(no='001').values('id')
                         permission_id = member_permission_qs.first()['id']
-                        LoocamFamilyMember.objects.create(family_id=user_family.id, user_id=user_id,
-                                                          user_name=device_user.username, identity=1,
-                                                          permission_id=int(permission_id), sort=1, updated_time=n_time,
-                                                          created_time=n_time)
+                        FamilyMember.objects.create(family_id=user_family.id, user_id=user_id,
+                                                    user_name=device_user.username, identity=1,
+                                                    permission_id=int(permission_id), sort=1, updated_time=n_time,
+                                                    created_time=n_time)
                         cls.family_device_binding(user_id, family_id=user_family.id)
 
-            family_member_qs = LoocamFamilyMember.objects.filter(user_id=user_id) \
+            family_member_qs = FamilyMember.objects.filter(user_id=user_id) \
                 .order_by('sort').values('identity', 'family_id', 'family__name', 'permission__no', 'family__location')
             items = []
             data = {}
@@ -545,12 +545,12 @@ class EquipmentFamilyView(View):
         with transaction.atomic():
             now_time = int(time.time())
             if family_id:
-                family_member = LoocamFamilyMember.objects.filter(family_id=family_id, user_id=user_id)
+                family_member = FamilyMember.objects.filter(family_id=family_id, user_id=user_id)
                 if family_member.exists():
                     family_member = family_member.first()
                     if family_member.identity == 0:
                         return response.json(404)
-                    family_qs = LoocamUserFamily.objects.filter(id=family_id)
+                    family_qs = UserFamily.objects.filter(id=family_id)
                     if family_qs.exists():
                         data = {
                             'updated_time': now_time
@@ -566,7 +566,7 @@ class EquipmentFamilyView(View):
                 data['name'] = family_name
                 if location:
                     data['location'] = location
-                LoocamUserFamily.objects.create(**data)
+                UserFamily.objects.create(**data)
                 return response.json(0)
             return response.json(444)
 
@@ -580,7 +580,7 @@ class EquipmentFamilyView(View):
         @return: Boole
         """
         now_time = int(time.time())
-        family_room_device = LoocamFamilyRoomDevice.objects.filter(device_id=device_id)
+        family_room_device = FamilyRoomDevice.objects.filter(device_id=device_id)
         if family_room_device.exists():
             return False
         data = {
@@ -591,9 +591,9 @@ class EquipmentFamilyView(View):
         }
         if room_id:
             room_id = int(room_id)
-            if LoocamFamilyRoom.objects.filter(id=room_id).exists():
+            if FamilyRoom.objects.filter(id=room_id).exists():
                 data['room_id'] = room_id
-        LoocamFamilyRoomDevice.objects.create(**data)
+        FamilyRoomDevice.objects.create(**data)
         return True
 
     @classmethod
@@ -612,14 +612,14 @@ class EquipmentFamilyView(View):
                 device_list = []
                 for item in device_info_qs:
                     device_id = item['id']
-                    family_device_qs = LoocamFamilyRoomDevice.objects.filter(device_id=device_id)
+                    family_device_qs = FamilyRoomDevice.objects.filter(device_id=device_id)
                     if not family_device_qs.exists():
                         # 设备绑定家庭
-                        device_list.append(LoocamFamilyRoomDevice(family_id=family_id, device_id=device_id,
-                                                                  created_time=not_time,
-                                                                  updated_time=not_time))
+                        device_list.append(FamilyRoomDevice(family_id=family_id, device_id=device_id,
+                                                            created_time=not_time,
+                                                            updated_time=not_time))
                 if device_list:
-                    LoocamFamilyRoomDevice.objects.bulk_create(device_list)
+                    FamilyRoomDevice.objects.bulk_create(device_list)
         return True
 
     @classmethod
@@ -639,14 +639,14 @@ class EquipmentFamilyView(View):
             return response.json(444)
         page_no = int(page_no)
         page_size = int(page_size)
-        room_qs = LoocamFamilyRoom.objects.filter(family_id=family_id).order_by('sort')
+        room_qs = FamilyRoom.objects.filter(family_id=family_id).order_by('sort')
         total = room_qs.count()
         room_qs = room_qs.values('id', 'name', 'sort')[(page_no - 1) * page_size: page_no * page_size]
         room_list = []
         if not room_qs.exists():
             return response.json(0, room_list)
         for item in room_qs:
-            item['deviceCount'] = LoocamFamilyRoomDevice.objects.filter(family_id=family_id, room_id=item['id']).count()
+            item['deviceCount'] = FamilyRoomDevice.objects.filter(family_id=family_id, room_id=item['id']).count()
             room_list.append(item)
         return response.json(0, {'total': total, 'data': room_list})
 
@@ -666,17 +666,17 @@ class EquipmentFamilyView(View):
         with transaction.atomic():
             now_time = int(time.time())
             if room_id:
-                room_qs = LoocamFamilyRoom.objects.filter(id=int(room_id))
+                room_qs = FamilyRoom.objects.filter(id=int(room_id))
                 if room_qs.exists():
                     room_qs.update(name=room_name, updated_time=now_time)
                     return response.json(0)
-            room_qs = LoocamFamilyRoom.objects.filter(family_id=family_id, name=room_name)
+            room_qs = FamilyRoom.objects.filter(family_id=family_id, name=room_name)
 
             if room_qs.exists():
                 room_dict = {'updated_time': now_time, 'name': room_name}
                 room_qs.update(**room_dict)
-            LoocamFamilyRoom.objects.create(family_id=family_id, name=room_name, updated_time=now_time,
-                                            created_time=now_time)
+            FamilyRoom.objects.create(family_id=family_id, name=room_name, updated_time=now_time,
+                                      created_time=now_time)
         return response.json(0)
 
     @classmethod
@@ -719,12 +719,12 @@ class EquipmentFamilyView(View):
         @param family_id:
         @return:
         """
-        member_qs = LoocamFamilyMember.objects.filter(family_id=family_id)
+        member_qs = FamilyMember.objects.filter(family_id=family_id)
         if user_id:
             member_qs = member_qs.filter(user_id=user_id).values()
             if member_qs.exists():
                 member_qs = member_qs.first()
-        permission = LoocamFamilyMemberPermission.objects.all().values('id', 'no')
+        permission = FamilyMemberPermission.objects.all().values('id', 'no')
         data_list = []
         this_permission = {}
         result = {}
@@ -739,10 +739,10 @@ class EquipmentFamilyView(View):
 
     @classmethod
     def get_member_permission_details(cls, user_id, family_id):
-        member_qs = LoocamFamilyMember.objects.filter(family_id=family_id, user_id=user_id).values()
+        member_qs = FamilyMember.objects.filter(family_id=family_id, user_id=user_id).values()
         if member_qs.exists():
             member_qs = member_qs.first()
             permission_id = member_qs['permission_id']
-            permission_qs = LoocamFamilyMemberPermission.objects.filter(id=permission_id).values('no')
+            permission_qs = FamilyMemberPermission.objects.filter(id=permission_id).values('no')
             return permission_qs.first()['no']
         return ''