ソースを参照

删除云盘上传记录

peng 2 年 前
コミット
3506442e99
2 ファイル変更101 行追加16 行削除
  1. 96 16
      Controller/IcloudService/IcloudService.py
  2. 5 0
      Object/AWS/AmazonS3Util.py

+ 96 - 16
Controller/IcloudService/IcloudService.py

@@ -4,7 +4,7 @@
 @Time : 2023-6-7 18:26:35
 @Time : 2023-6-7 18:26:35
 @File :IcloudMeal.py
 @File :IcloudMeal.py
 """
 """
-import logging
+from Ansjer.config import LOGGER
 import time
 import time
 
 
 from django.db.models import Sum, Q
 from django.db.models import Sum, Q
@@ -20,8 +20,6 @@ from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, SERVER_
     AWS_SECRET_ACCESS_KEY
     AWS_SECRET_ACCESS_KEY
 from Service.VodHlsService import SplitVodHlsObject
 from Service.VodHlsService import SplitVodHlsObject
 
 
-logger = logging.getLogger('info')
-
 
 
 class IcloudServiceView(View):
 class IcloudServiceView(View):
     def get(self, request, *args, **kwargs):
     def get(self, request, *args, **kwargs):
@@ -47,6 +45,8 @@ class IcloudServiceView(View):
             return self.get_upload_url(request_dict, response, user_id)
             return self.get_upload_url(request_dict, response, user_id)
         elif operation == 'localUpload':  # 本地上传云盘
         elif operation == 'localUpload':  # 本地上传云盘
             return self.local_upload(request_dict, response, user_id)
             return self.local_upload(request_dict, response, user_id)
+        elif operation == 'deleteIcloudRecord':  # 删除云盘记录
+            return self.delete_icloud_record(request_dict, response, user_id)
         else:
         else:
             return response.json(404)
             return response.json(404)
 
 
@@ -62,7 +62,7 @@ class IcloudServiceView(View):
         @param response: 响应对象
         @param response: 响应对象
         @return: response
         @return: response
         """
         """
-        logger.info('开始云存转移到云盘')
+        LOGGER.info('开始云存转移到云盘')
         uid = request_dict.get('uid', None)
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         channel = request_dict.get('channel', None)
         time_stamp = request_dict.get('time_stamp', None)
         time_stamp = request_dict.get('time_stamp', None)
@@ -86,13 +86,13 @@ class IcloudServiceView(View):
             'size').aggregate(total_size=Sum('size'))['total_size']
             'size').aggregate(total_size=Sum('size'))['total_size']
         all_size = all_size * 1024 if all_size else 0
         all_size = all_size * 1024 if all_size else 0
         if use_size > all_size:
         if use_size > all_size:
-            logger.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(uid, all_size, use_size))
+            LOGGER.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(uid, all_size, use_size))
             return response.json(910)
             return response.json(910)
         split_vod_hls_obj = SplitVodHlsObject()
         split_vod_hls_obj = SplitVodHlsObject()
         vod_hls = split_vod_hls_obj.get_vod_hls_data(uid=uid, channel=channel, start_time=time_stamp).values(
         vod_hls = split_vod_hls_obj.get_vod_hls_data(uid=uid, channel=channel, start_time=time_stamp).values(
             'bucket_id', 'fg', 'sec')
             'bucket_id', 'fg', 'sec')
         if not vod_hls.exists():
         if not vod_hls.exists():
-            logger.info('{}用户查无此云存:{}'.format(uid, time_stamp))
+            LOGGER.info('{}用户查无此云存:{}'.format(uid, time_stamp))
             return response.json(173)
             return response.json(173)
         source_bucket_id = vod_hls[0]['bucket_id']
         source_bucket_id = vod_hls[0]['bucket_id']
         fg = int(vod_hls[0]['fg'])
         fg = int(vod_hls[0]['fg'])
@@ -128,7 +128,7 @@ class IcloudServiceView(View):
             ts_size = round(ts_size / 1024 / 1024, 2)  # 字节转换为MB单位
             ts_size = round(ts_size / 1024 / 1024, 2)  # 字节转换为MB单位
             temp_size = ts_size + use_size
             temp_size = ts_size + use_size
             if temp_size > all_size:
             if temp_size > all_size:
-                logger.info('{}用户无空间上传,套餐容量为:{},使用容量为:{}'.format(uid, all_size, temp_size))
+                LOGGER.info('{}用户无空间上传,套餐容量为:{},使用容量为:{}'.format(uid, all_size, temp_size))
                 return response.json(910)
                 return response.json(910)
             time_stamp = int(time_stamp) * 1000  # 转换单位为毫秒
             time_stamp = int(time_stamp) * 1000  # 转换单位为毫秒
             icloud_record_qs = IcloudStorageRecord.objects.filter(user_id=user_id, uid=uid, channel=channel,
             icloud_record_qs = IcloudStorageRecord.objects.filter(user_id=user_id, uid=uid, channel=channel,
@@ -153,7 +153,7 @@ class IcloudServiceView(View):
             else:
             else:
                 return response.json(174)
                 return response.json(174)
         except Exception as e:
         except Exception as e:
-            logger.info('云存转移云盘异常:{}'.format(repr(e)))
+            LOGGER.info('云存转移云盘异常:{}'.format(repr(e)))
             return response.json(500)
             return response.json(500)
 
 
     @staticmethod
     @staticmethod
@@ -162,11 +162,16 @@ class IcloudServiceView(View):
         本地上传云盘
         本地上传云盘
         @param request_dict: 请求参数
         @param request_dict: 请求参数
         @param user_id: 用户id
         @param user_id: 用户id
-        @request_dict serial_number: 序列号
+        @request_dict uid: 设备uid
+        @request_dict channel: 设备通道
+        @request_dict time_stamp: 时间戳
+        @request_dict size: 文件大小
+        @request_dict file_type: 文件类型
+        @request_dict sec: 时长
         @param response: 响应对象
         @param response: 响应对象
         @return: response
         @return: response
         """
         """
-        logger.info('开始本地转移到云盘')
+        LOGGER.info('开始本地转移到云盘')
         uid = request_dict.get('uid', None)
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         channel = request_dict.get('channel', None)
         time_stamp = request_dict.get('time_stamp', None)
         time_stamp = request_dict.get('time_stamp', None)
@@ -194,7 +199,7 @@ class IcloudServiceView(View):
             'size').aggregate(total_size=Sum('size'))['total_size']
             'size').aggregate(total_size=Sum('size'))['total_size']
         all_size = all_size * 1024 if all_size else 0
         all_size = all_size * 1024 if all_size else 0
         if use_size > all_size:
         if use_size > all_size:
-            logger.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(uid, all_size, use_size))
+            LOGGER.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(uid, all_size, use_size))
             return response.json(910)
             return response.json(910)
 
 
         try:
         try:
@@ -212,7 +217,7 @@ class IcloudServiceView(View):
             else:
             else:
                 return response.json(174)
                 return response.json(174)
         except Exception as e:
         except Exception as e:
-            logger.info('云存转移云盘异常:{}'.format(repr(e)))
+            LOGGER.info('本地转移云盘异常:{}'.format(repr(e)))
             return response.json(500)
             return response.json(500)
 
 
     @staticmethod
     @staticmethod
@@ -221,11 +226,14 @@ class IcloudServiceView(View):
         获取s3上传地址
         获取s3上传地址
         @param request_dict: 请求参数
         @param request_dict: 请求参数
         @param user_id: 用户id
         @param user_id: 用户id
-        @request_dict serial_number: 序列号
+        @request_dict time_stamp: 时间戳
+        @request_dict file_type: 文件类型
+        @request_dict uid: 设备uid
+        @request_dict channel: 设备通道
         @param response: 响应对象
         @param response: 响应对象
         @return: response
         @return: response
         """
         """
-        logger.info('获取s3上传地址')
+        LOGGER.info('获取s3上传地址')
         time_stamp = request_dict.get('time_stamp', None)
         time_stamp = request_dict.get('time_stamp', None)
         file_type = request_dict.get('file_type', None)
         file_type = request_dict.get('file_type', None)
         uid = request_dict.get('uid', None)
         uid = request_dict.get('uid', None)
@@ -250,7 +258,7 @@ class IcloudServiceView(View):
         all_size = all_size * 1024 if all_size else 0
         all_size = all_size * 1024 if all_size else 0
         excess_size = all_size - use_size
         excess_size = all_size - use_size
         if excess_size < 0:
         if excess_size < 0:
-            logger.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(user_id, all_size, use_size))
+            LOGGER.info('{}用户套餐总容量为:{},已使用容量为:{}'.format(user_id, all_size, use_size))
             return response.json(910)
             return response.json(910)
 
 
         bucket_qs = VodBucketModel.objects.filter(id=bucket_id).values('bucket', 'region', 'mold')
         bucket_qs = VodBucketModel.objects.filter(id=bucket_id).values('bucket', 'region', 'mold')
@@ -278,5 +286,77 @@ class IcloudServiceView(View):
             upload_url = s3_obj.generate_put_obj_url(bucket_name, key_name)
             upload_url = s3_obj.generate_put_obj_url(bucket_name, key_name)
             return response.json(0, {'uploadUrl': upload_url, 'excessSize': excess_size})
             return response.json(0, {'uploadUrl': upload_url, 'excessSize': excess_size})
         except Exception as e:
         except Exception as e:
-            logger.info('获取s3上传地址异常:{}'.format(repr(e)))
+            LOGGER.info('获取s3上传地址异常:{}'.format(repr(e)))
+            return response.json(500)
+
+    @staticmethod
+    def delete_icloud_record(request_dict, response, user_id):
+        """
+        删除云盘记录
+        @param request_dict: 请求参数
+        @param user_id: 用户id
+        @request_dict time_stamp: 时间戳
+        @request_dict uid: 设备uid
+        @request_dict channel: 设备通道
+        @param response: 响应对象
+        @return: response
+        """
+        LOGGER.info('删除云盘记录')
+        time_stamp = request_dict.get('time_stamp', None)
+        file_type = request_dict.get('file_type', None)
+        uid = request_dict.get('uid', None)
+        channel = request_dict.get('channel', None)
+        if not all([time_stamp, uid, channel]):
+            return response.json(444, {'error param': 'time_stamp,channel,uid'})
+        # 查询是否开通云盘
+        use_details_qs = IcloudUseDetails.objects.filter(user_id=user_id).values('use_size', 'bucket_id')
+        if not use_details_qs.exists():
+            return response.json(173)
+        use_size = float(use_details_qs[0]['use_size'])
+        bucket_id = use_details_qs[0]['bucket_id']
+        icloud_record_qs = IcloudStorageRecord.objects.filter(user_id=user_id, uid=uid, channel=channel,
+                                                              time_stamp=time_stamp,
+                                                              bucket_id=bucket_id, file_type=file_type)
+        if not icloud_record_qs.exists():
+            return response.json(173)
+        record_qs = icloud_record_qs.values('size')
+        size = float(record_qs[0]['size'])
+        bucket_qs = VodBucketModel.objects.filter(id=bucket_id).values('bucket', 'region', 'mold')
+        if not bucket_qs.exists():
+            return response.json(173)
+        bucket_name = bucket_qs[0]['bucket']
+        bucket_region = bucket_qs[0]['region']
+        mold = bucket_qs[0]['mold']
+        try:
+            s3_obj = AmazonS3Util(
+                AWS_ACCESS_KEY_ID[mold],
+                AWS_SECRET_ACCESS_KEY[mold],
+                bucket_region
+            )
+            new_size = round(use_size - size, 2)
+            new_size = new_size if new_size > 0 else 0
+            if file_type == '0':  # 图片
+                key_name = '{user_id}/image_file/{uid}/vod{channel}/{time}'.format(user_id=user_id, uid=uid,
+                                                                                   channel=channel,
+                                                                                   time=time_stamp)
+                object_list = s3_obj.get_object_list(bucket_name, key_name)
+            elif file_type == '1':  # ts文件
+                key_name = '{user_id}/ts_file/{uid}/vod{channel}/{time}'.format(user_id=user_id, uid=uid,
+                                                                                channel=channel,
+                                                                                time=time_stamp)
+                object_list = s3_obj.get_object_list(bucket_name, key_name)
+            elif file_type == '2':  # mp4文件
+                key_name = '{user_id}/mp4_file/{uid}/vod{channel}/{time}'.format(user_id=user_id, uid=uid,
+                                                                                 channel=channel,
+                                                                                 time=time_stamp)
+                object_list = s3_obj.get_object_list(bucket_name, key_name)
+            else:
+                return response.json(444, {'error param': 'file_type'})
+            for item in object_list:
+                s3_obj.delete_obj(bucket_name, item['Key'])
+            icloud_record_qs.delete()
+            use_details_qs.update(use_size=new_size)
+            return response.json(0)
+        except Exception as e:
+            LOGGER.info('获取s3上传地址异常:{}'.format(repr(e)))
             return response.json(500)
             return response.json(500)

+ 5 - 0
Object/AWS/AmazonS3Util.py

@@ -225,3 +225,8 @@ class AmazonS3Util:
         s3 = self.session_conn
         s3 = self.session_conn
         obj = s3.Object(bucket_name, object_key)
         obj = s3.Object(bucket_name, object_key)
         return obj.content_length
         return obj.content_length
+
+    def get_object_list(self, bucket_name, prefix):
+        s3 = self.client_conn
+        obj = s3.list_objects_v2(Bucket=bucket_name, Prefix=prefix)
+        return obj['Contents']