Эх сурвалжийг харах

修改创建信号通道接口,不存在分组返回0

locky 1 сар өмнө
parent
commit
2cf3ba1aee

+ 10 - 1
Controller/AWS/KVSController.py

@@ -534,6 +534,15 @@ class KVSView(View):
         if not all([serial]):
             return response.json(444)
         try:
+            # 已有数据直接返回
+            res = {
+                'region': KVS_REGION,
+                'role_alias': 'KvsCameraIoTRoleAlias'
+            }
+            kvs = KVS.objects.filter(channel_name=serial)
+            if kvs.exists():
+                return response.json(0, res)
+
             kinesis_video_obj = AmazonKinesisVideoObject(
                 aws_access_key_id=ACCESS_KEY_ID,
                 secret_access_key=SECRET_ACCESS_KEY,
@@ -545,7 +554,7 @@ class KVSView(View):
                 channel_name=serial, channel_arn=channel_arn, channel_ttl=60,
                 created_time=now_time, updated_time=now_time
             )
-            return response.json(0)
+            return response.json(0, res)
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 

+ 1 - 1
Controller/DeviceManagement/DeviceGroupController.py

@@ -53,7 +53,7 @@ class DeviceGroupView(View):
         # 该用户已存在该组名的分组
         device_group_qs = DeviceGroup.objects.filter(user_id=user_id).values('id', 'group_name')
         if not device_group_qs.exists():
-            return response.json(173)
+            return response.json(0)
         res = []
         for device_group in device_group_qs:
             device_quantity = Device_Info.objects.filter(device_group_id=device_group['id']).count()