设备分享权限

Controller/UserDevice/UserDeviceShareController.py

@@ -96,7 +96,7 @@ class UserDeviceShareView(View):
                 is_select = 1 if str(channel) in share_channel_list else 0
                 c_list.append({'channelIndex': channel, 'isSelect': is_select})
             p_list = []
-            permission_qs = DeviceSharePermission.objects.all()
+            permission_qs = DeviceSharePermission.objects.filter(share_type=1)
             share_permission_list = [item['permission_id'] for item in channel_permission_qs]
             for item in permission_qs:
                 is_select = 1 if item.id in share_permission_list else 0
@@ -182,7 +182,7 @@ class UserDeviceShareView(View):
                               'created_time': now_time, 'updated_time': now_time}
                 device_user_set = DeviceChannelUserSet.objects.create(**device_set)
                 channel_permission_qs = DeviceSharePermission.objects \
-                    .all().values('id', 'code').order_by('sort')
+                    .filter(share_type=1).values('id', 'code').order_by('sort')
                 user_set_id = device_user_set.id
                 channel_permission_list = []
                 for item in channel_permission_qs:

Model/models.py

@@ -4389,6 +4389,7 @@ class DeviceChannelUserSet(models.Model):
 class DeviceSharePermission(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     code = models.CharField(blank=True, db_index=True, max_length=32, verbose_name=u'权限编码')
+    share_type = models.SmallIntegerField(default=1, verbose_name='分享权限类型')  # 1：分享设备通道权限； 2：分享设备权限
     sort = models.IntegerField(default=99, blank=True, verbose_name=u'排序，越小越靠前')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
     updated_time = models.IntegerField(default=0, verbose_name='更新时间')

Service/UserDeviceService.py

@@ -274,7 +274,7 @@ class UserDeviceService:
                 .filter(channel_user_id=channel_set_qs[0]['id']).values('permission_id')
             ids = [val['permission_id'] for val in channel_permission_qs]
             channel_permission_qs = DeviceSharePermission.objects \
-                .all().values('id', 'code').order_by('sort')
+                .filter(share_type=1).values('id', 'code').order_by('sort')
             channel_permission_list = []
             default_permissions = []
             if not channel_permission_qs.exists():