新增设备套餐状态字段；修改设备关联套餐表状态

AdminController/DeviceManagementController.py

@@ -241,10 +241,8 @@ class DeviceManagement(View):
                             isHuman = '是' if uid_set_qs[0]['is_human'] else '否'
                             if uid_set_qs[0]['cloud_vod'] == 2:
                                 cloud_vod = '不支持'
-                            elif uid_set_qs[0]['cloud_vod'] == 1:
-                                cloud_vod = '开启'
                             else:
-                                cloud_vod = '关闭'
+                                cloud_vod = '支持'
                             if uid_set_qs[0]['is_ai'] == 2:
                                 isAI = '不支持'
                             elif uid_set_qs[0]['is_ai'] == 1:
@@ -257,6 +255,20 @@ class DeviceManagement(View):
                             device_info_list["datas"][k]['fields']['cloudVod'] = cloud_vod
                             device_info_list["datas"][k]['fields']['ip'] = uid_set_qs[0]['ip']
                             device_info_list["datas"][k]['fields']['version'] = uid_set_qs[0]['version']
+                        uid_bucket_qs = UID_Bucket.objects.filter(
+                            uid=device_info_list["datas"][k]['fields']['UID']).values('status')
+                        #  0是关闭，1是开启
+                        if uid_bucket_qs.exists():
+                            res = []
+                            for uid_bucket in uid_bucket_qs:
+                                status = uid_bucket['status']
+                                res.append(status)
+                            if 1 in res:
+                                device_info_list["datas"][k]['fields']['status'] = 1
+                            else:
+                                device_info_list["datas"][k]['fields']['status'] = 0
+                        else:
+                            device_info_list["datas"][k]['fields']['status'] = 0
             return response.json(0, {'list': device_info_list, 'total': total})
         except Exception as e:
             print(e)
@@ -661,7 +673,7 @@ class DeviceManagement(View):
             return response.json(0, res)
         except Exception as e:
             print(e)
-            return  response.json(500, (repr(e)))
+            return response.json(500, (repr(e)))
 
     @staticmethod
     def get_app_device_type_list(request_dict, response):

Model/models.py

@@ -1270,7 +1270,7 @@ class UID_Bucket(models.Model):
     uid = models.CharField(max_length=20, verbose_name='设备UID', db_index=True)
     channel = models.SmallIntegerField(default=0, 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:开启]')  # 修改2023/5/15(原状态[0:开启,1:关闭])
     endTime = models.BigIntegerField(verbose_name='套餐结束时间', db_index=True, default=0)
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updateTime = models.BigIntegerField(verbose_name='更新时间', default=0)