Merge remote-tracking branch 'remotes/origin/peng' into test

AdminController/IcloudManagementController.py

@@ -58,12 +58,6 @@ class IcloudServeView(View):
                 return self.get_user_icloud_info(request_dict, response)
             elif operation == 'resetIcloud':
                 return self.reset_icloud(request_dict, response)
-            # ai用户信息相关
-            elif operation == 'getAiUserList':
-                return self.getAiUserList(request_dict, response)
-            # ai服务开通数量数据
-            elif operation == 'getAiDataList':
-                return self.getAiDataList(request_dict, response)
             else:
                 return response.json(404)
 
@@ -113,7 +107,7 @@ class IcloudServeView(View):
     @staticmethod
     def add_or_edit_icloud_store_meal(request_dict, response):
         # 添加/编辑套餐
-        meal_id = request_dict.get('MealID', None)
+        meal_id = request_dict.get('IcloudMealID', None)
         expire = int(request_dict.get('expire', None))
         price = request_dict.get('price', None)
         currency = request_dict.get('currency', None)
@@ -274,8 +268,7 @@ class IcloudServeView(View):
                 AWS_SECRET_ACCESS_KEY[mold],
                 bucket_region
             )
-            key_name = '{user_id}'.format(user_id=user_id)
-            object_list = s3_obj.get_object_list(bucket_name, key_name)
+            object_list = s3_obj.get_object_list(bucket_name, user_id)
             for obj in object_list:
                 s3_obj.delete_obj(bucket_name, obj['Key'])
             icloud_record.delete()

Controller/Cron/CronTaskController.py

@@ -20,7 +20,7 @@ from Ansjer.config import USED_SERIAL_REDIS_LIST, UNUSED_SERIAL_REDIS_LIST, CONF
 from Model.models import Device_User, Device_Info, UidSetModel, UID_Bucket, Unused_Uid_Meal, Order_Model, StsCrdModel, \
     VodHlsModel, ExperienceContextModel, AiService, VodHlsSummary, VideoPlaybackTimeModel, DeviceUserSummary, \
     CountryModel, DeviceTypeModel, OrdersSummary, DeviceInfoSummary, CompanySerialModel, \
-    CloudLogModel, UidCloudStorageCount, UserExModel, DeviceDomainRegionModel, VodHlsTag, VodHlsTagType
+    CloudLogModel, UidCloudStorageCount, UserExModel, DeviceDomainRegionModel, VodHlsTag, VodHlsTagType, IcloudService
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.utils import LocalDateTimeUtil
@@ -257,6 +257,8 @@ class CronUpdateDataView(View):
             return self.updateUnusedUidBucket(response)
         elif operation == 'updateUnusedAiService':  # 定时更新过期ai关联的未使用套餐状态
             return self.updateUnusedAiService(response)
+        elif operation == 'updateIcloudService':  # 定时更新过期云盘套餐使用状态
+            return self.updateIcloudService(response)
         elif operation == 'reqUpdateSerialStatus':  # 定时请求更新序列号状态
             return self.reqUpdateSerialStatus(response)
         elif operation == 'updateSerialStatus':  # 更新序列号状态
@@ -354,6 +356,22 @@ class CronUpdateDataView(View):
                 continue
         return response.json(0)
 
+    @staticmethod
+    def updateIcloudService(response):
+        """
+        监控云盘套餐过期修改状态
+        @param response:
+        @return:
+        """
+        # 定时更新已过期套餐修改状态为2
+        now_time = int(time.time())
+        try:
+            IcloudService.objects.filter(Q(end_time__lte=now_time), ~Q(end_time=0),
+                                         ~Q(use_status=1)).update(use_status=1)
+            return response.json(0)
+        except Exception as e:
+            return response.json(500)
+
     @classmethod
     def reqUpdateSerialStatus(cls, response):
         redis_obj = RedisObject()
@@ -994,4 +1012,3 @@ class CronCollectDataView(View):
             return response.json(0)
         except Exception as e:
             return response.json(500, repr(e))
-