整合定时任务相关接口

Ansjer/urls.py

@@ -21,7 +21,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     DetectControllerV2, ShadowController, TestDetectController, PcInfo, PctestController, DeviceDebug, PaymentCycle, \
     DeviceLogController, CouponController, AiController
 from Controller.Surveys import CloudStorageController
-from Controller.Cron import CronDelDataController
+from Controller.Cron import CronTaskController
 from AdminController import UserManageController, RoleController, MenuController, TestServeController, \
     ServeManagementController, LogManagementController, DeviceManagementController, VersionManagementController, \
     AiServeController, SurveysManageController
@@ -210,12 +210,6 @@ urlpatterns = [
     url(r'^oauth/perfect', UserController.OauthPerfectView.as_view()),
     url(r'^oauth/unbunding', UserController.UnbundingWXView.as_view()),
 
-    # 删除云存视频
-    # path('cv/del', CloudVod.deleteVodHls),
-    path('cv/del', CloudStorage.deleteVodHls),
-    path('cv/delCloudLog', CloudStorage.deleteCloudLog),
-    path('cv/updateExpiredUidBucket', CloudStorage.updateExpiredUidBucket),
-    path('cv/updateUnusedUidBucket', CloudStorage.updateUnusedUidBucket),
     url(r'^equipment/judge', EquipmentManager.judgeInterface),
 
     # ap模式，新增设备表
@@ -394,7 +388,9 @@ urlpatterns = [
     # 后台界面接口 -----------------------------------------------------
 
     # 定时删除任务接口
-    url(r'^cron/(?P<operation>.*)', CronDelDataController.CronDelDataView.as_view()),
+    url(r'^cron/del/(?P<operation>.*)', CronTaskController.CronDelDataView.as_view()),
+    # 定时更新任务接口
+    url(r'^cron/update/(?P<operation>.*)', CronTaskController.CronUpdateDataView.as_view()),
 
     re_path('(?P<path>.*)', LogManager.errorPath),
 

Controller/CloudStorage.py

@@ -2046,78 +2046,3 @@ class CloudStorageView(View):
             return response.json(500, repr(e))
 
 
-# 删除过期云存播放列表
-def deleteVodHls(request):
-    # UID = 'DSXG7481JVA2JM94111A'
-    # channel = 1
-    # ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel). \
-    #     values("bucket_id", "endTime", "bucket__storeDay")
-    # nowTime = int(time.time())
-    # if ubqs.exists():
-    #     ubqs_count = ubqs.count()
-    #     ubq = ubqs[ubqs_count - 1, ubqs_count]
-    #     new_starTime = ubq['endTime'] + 1
-    #     print(new_starTime)
-    #     exit()
-    #
-    #     # ub_cqs = UID_Bucket.objects.create(uid=UID, channel=channel, bucket_id=bucketId,
-    #     #                                    endTime=new_starTime + addTime)
-    #     # uid_bucket_id = ub_cqs.id
-    # exit()
-
-    response = ResponseObject()
-    i = int(request.GET.get('i', 5))
-    nowTime = int(time.time()) - 3 * 30 * 24 * 60 * 60  # 保留3个月的数据
-    for i in range(i):
-        vh_qs = VodHlsModel.objects.filter(endTime__lte=str(nowTime))[0:10000]
-        id_list = vh_qs.values_list("id", flat=True)
-        print(id_list)
-        VodHlsModel.objects.filter(id__in=list(id_list)).delete()
-    return response.json(0)
-
-
-# 更新过期云存关联套餐
-def updateExpiredUidBucket(request):
-    response = ResponseObject()
-    now_time = int(time.time())
-    expired_uid_bucket = UID_Bucket.objects.filter(endTime__lte=now_time)
-    id_list = expired_uid_bucket.values_list("id", flat=True)
-    UID_Bucket.objects.filter(id__in=list(id_list)).update(use_status=2)  # 更新过期云存关联套餐状态
-    return response.json(0)
-
-# 如果云存关联套餐过期，更新未使用的关联套餐
-def updateUnusedUidBucket(request):
-    response = ResponseObject()
-    now_time = int(time.time())
-    expired_uid_buckets = UID_Bucket.objects.filter(endTime__lte=now_time,has_unused=1).values("id","uid")[0:1000]
-    for expired_uid_bucket in expired_uid_buckets:
-        unuseds = Unused_Uid_Meal.objects.filter(uid=expired_uid_bucket['uid']).values("id","uid","channel","addTime","expire",
-                                                                  "num","bucket_id").order_by('addTime')[0:1]
-        if not unuseds.exists():
-            continue
-        unused = unuseds[0]
-        try:
-            with transaction.atomic():
-                count_unused = Unused_Uid_Meal.objects.filter(uid=expired_uid_bucket['uid']).count()
-                has_unused = 1 if count_unused>1 else 0
-                endTime = CommonService.calcMonthLater(unused['expire'] * unused['num'])
-                UID_Bucket.objects.filter(uid=expired_uid_bucket['uid']).update(channel=unused['channel'],endTime=endTime,bucket_id=unused['bucket_id']
-                                                          ,updateTime=now_time,use_status=1,
-                                                          has_unused=has_unused)
-                Unused_Uid_Meal.objects.filter(id=unused['id']).delete()
-                StsCrdModel.objects.filter(uid=expired_uid_bucket['uid']).delete()  # 删除sts记录
-                # VodHlsModel.objects.filter(uid=expired_uid_bucket['uid']).delete()  # 删除播放列表,后期数据量多时应该考虑延后删除
-        except Exception:
-            continue
-    # UID_Bucket.objects.filter(id__in=list(id_list)).update(use_status=2)  # 更新过期云存关联套餐状态
-    return response.json(0)
-
-# 删除三个月之前的cloud_log数据
-def deleteCloudLog(request):
-    response = ResponseObject()
-    delTime = int(time.time()) - 3 * 30 * 24 * 60 * 60  # 保留3个月的数据
-    for i in range(5):
-        cloud_log_qs = CloudLogModel.objects.filter(time__lte=delTime)[0:10000]
-        id_list = cloud_log_qs.values_list('id', flat=True)
-        CloudLogModel.objects.filter(id__in=list(id_list)).delete()
-    return response.json(0)

Controller/Cron/CronDelDataController.py

@@ -1,67 +0,0 @@
-#!/usr/bin/python3.6
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2022 #
-# @Time    : 2022/4/1 11:27
-# @Author  : ming
-# @Email   : zhangdongming@asj6.wecom.work
-# @File    : CronDelDataController.py
-# @Software: PyCharm
-import time
-
-from django.db import connection, connections
-from django.views import View
-
-from Object.ResponseObject import ResponseObject
-from Object.utils import LocalDateTimeUtil
-
-
-class CronDelDataView(View):
-    def get(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation')
-        return self.validation(request.GET, request, operation)
-
-    def post(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation')
-        return self.validation(request.POST, request, operation)
-
-    def validation(self, request_dict, request, operation):
-        response = ResponseObject()
-        if operation == 'access-log/del':   # 定时删除访问接口数据
-            return self.del_access_log(response)
-        elif operation == 'push-info/del':  # 定时删除推送数据
-            return self.del_push_info(response)
-        else:
-            return response.json(404)
-
-    @staticmethod
-    def del_access_log(response):
-        try:
-            cursor = connection.cursor()
-            # 删除一个月前的数据
-            last_month = LocalDateTimeUtil.get_last_month()
-            sql = 'DELETE FROM access_log WHERE time < %s limit %s'
-            cursor.execute(sql, [last_month, 10000])
-            # 关闭游标
-            cursor.close()
-            connection.close()
-            return response.json(0)
-        except Exception as e:
-            return response.json(500, repr(e))
-
-    @staticmethod
-    def del_push_info(response):
-        nowTime = int(time.time())
-        cursor = connections['mysql02'].cursor()
-        try:
-            for i in range(5):
-                # 删除7天前的数据
-                sql = "DELETE FROM `equipment_info` WHERE addTime<={} LIMIT 10000".format(nowTime - 3600 * 24 * 7)
-                cursor.execute(sql)
-            # 关闭游标
-            cursor.close()
-            return response.json(0)
-        except Exception as e:
-            return response.json(500, repr(e))

Controller/Cron/CronTaskController.py

@@ -0,0 +1,221 @@
+#!/usr/bin/python3.6
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2022 #
+# @Time    : 2022/4/1 11:27
+# @Author  : ming
+# @Email   : zhangdongming@asj6.wecom.work
+# @File    : CronTaskController.py
+# @Software: PyCharm
+import time
+
+from django.db import connection, connections, transaction
+from django.views import View
+
+from Model.models import Device_User, Device_Info, UidSetModel, UID_Bucket, Unused_Uid_Meal, Order_Model, StsCrdModel, \
+    VodHlsModel, ExperienceContextModel
+from Object.ResponseObject import ResponseObject
+from Object.utils import LocalDateTimeUtil
+from Service import CommonService
+
+
+class CronDelDataView(View):
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.GET, request, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.POST, request, operation)
+
+    def validation(self, request_dict, request, operation):
+        response = ResponseObject()
+        if operation == 'delAccessLog':   # 定时删除访问接口数据
+            return self.delAccessLog(response)
+        elif operation == 'delPushInfo':  # 定时删除推送数据
+            return self.delPushInfo(response)
+        elif operation == 'delVodHls':  # 定时删除云存播放列表
+            return self.delVodHls(response)
+        elif operation == 'delCloudLog':  # 定时删除云存接口数据
+            return self.delCloudLog(response)
+        elif operation == 'delTesterDevice':  # 定时删除测试账号下的设备数据
+            return self.delTesterDevice(response)
+        else:
+            return response.json(404)
+
+    @staticmethod
+    def delAccessLog(response):
+        try:
+            cursor = connection.cursor()
+            # 删除一个月前的数据
+            last_month = LocalDateTimeUtil.get_last_month()
+            sql = 'DELETE FROM access_log WHERE time < %s limit %s'
+            cursor.execute(sql, [last_month, 10000])
+            # 关闭游标
+            cursor.close()
+            connection.close()
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
+    @staticmethod
+    def delPushInfo(response):
+        nowTime = int(time.time())
+        cursor = connections['mysql02'].cursor()
+        try:
+            for i in range(5):
+                # 删除7天前的数据
+                sql = "DELETE FROM `equipment_info` WHERE addTime<={} LIMIT 10000".format(
+                    nowTime - 3600 * 24 * 7)
+                cursor.execute(sql)
+            # 关闭游标
+            cursor.close()
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
+    @staticmethod
+    def delVodHls(response):
+        nowTime = int(time.time())
+        cursor = connection.cursor()
+        try:
+            # 删除3个月前的数据
+            sql = "DELETE FROM `vod_hls` WHERE endTime<={} LIMIT 50000".format(
+                nowTime - 3 * 30 * 24 * 60 * 60)
+            cursor.execute(sql)
+            # 关闭游标
+            cursor.close()
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
+    @staticmethod
+    def delCloudLog(response):
+        nowTime = int(time.time())
+        cursor = connection.cursor()
+        try:
+            # 删除3个月前的数据
+            sql = "DELETE FROM `cloud_log` WHERE time<={} LIMIT 50000".format(
+                nowTime - 3 * 30 * 24 * 60 * 60)
+            cursor.execute(sql)
+            # 关闭游标
+            cursor.close()
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
+    @staticmethod
+    def delTesterDevice(response):
+        try:
+            userID_list = [
+                'tech01@ansjer.com',
+                'tech02@ansjer.com',
+                'tech03@ansjer.com',
+                'tech04@ansjer.com',
+                'tech05@ansjer.com',
+                'tech06@ansjer.com',
+                'tech07@ansjer.com',
+                'tech08@ansjer.com',
+                'tech09@ansjer.com',
+                'tech10@ansjer.com',
+                'fix01@ansjer.com',
+                'fix02@ansjer.com',
+                'fix03@ansjer.com',
+                'fix04@ansjer.com',
+                'fix05@ansjer.com']
+            device_user = Device_User.objects.filter(username__in=userID_list)
+            device_info_qs = Device_Info.objects.filter(
+                userID__in=device_user).values('UID')
+            uid_list = []
+            for device_info in device_info_qs:
+                uid_list.append(device_info['UID'])
+            with transaction.atomic():
+                # 删除设备云存相关数据
+                UidSetModel.objects.filter(uid__in=uid_list).delete()
+                UID_Bucket.objects.filter(uid__in=uid_list).delete()
+                Unused_Uid_Meal.objects.filter(uid__in=uid_list).delete()
+                Order_Model.objects.filter(UID__in=uid_list).delete()
+                StsCrdModel.objects.filter(uid__in=uid_list).delete()
+                VodHlsModel.objects.filter(uid__in=uid_list).delete()
+                ExperienceContextModel.objects.filter(
+                    uid__in=uid_list).delete()
+                Device_Info.objects.filter(userID__in=device_user).delete()
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
+
+class CronUpdateDataView(View):
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.GET, request, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.POST, request, operation)
+
+    def validation(self, request_dict, request, operation):
+        response = ResponseObject()
+        if operation == 'expiredUidBucket':   # 定时更新过期云存套餐状态
+            return self.expiredUidBucket(response)
+        if operation == 'updateUnusedUidBucket':   # 定时更新过期云存关联的未使用套餐状态
+            return self.updateUnusedUidBucket(response)
+        else:
+            return response.json(404)
+
+    @staticmethod
+    def expiredUidBucket(response):
+        now_time = int(time.time())
+        expired_uid_bucket = UID_Bucket.objects.filter(endTime__lte=now_time)
+        id_list = expired_uid_bucket.values_list('id', flat=True)
+        UID_Bucket.objects.filter(id__in=list(id_list)).update(use_status=2)
+        return response.json(0)
+
+    @staticmethod
+    def updateUnusedUidBucket(response):
+        now_time = int(time.time())
+        expired_uid_buckets = UID_Bucket.objects.filter(
+            endTime__lte=now_time,
+            has_unused=1).values(
+            "id",
+            "uid")[
+            0:1000]
+        for expired_uid_bucket in expired_uid_buckets:
+            unuseds = Unused_Uid_Meal.objects.filter(
+                uid=expired_uid_bucket['uid']).values(
+                "id",
+                "uid",
+                "channel",
+                "addTime",
+                "expire",
+                "num",
+                "bucket_id").order_by('addTime')[
+                0:1]
+            if not unuseds.exists():
+                continue
+            unused = unuseds[0]
+            try:
+                with transaction.atomic():
+                    count_unused = Unused_Uid_Meal.objects.filter(
+                        uid=expired_uid_bucket['uid']).count()
+                    has_unused = 1 if count_unused > 1 else 0
+                    endTime = CommonService.calcMonthLater(
+                        unused['expire'] * unused['num'])
+                    UID_Bucket.objects.filter(
+                        uid=expired_uid_bucket['uid']).update(
+                        channel=unused['channel'],
+                        endTime=endTime,
+                        bucket_id=unused['bucket_id'],
+                        updateTime=now_time,
+                        use_status=1,
+                        has_unused=has_unused)
+                    Unused_Uid_Meal.objects.filter(id=unused['id']).delete()
+                    StsCrdModel.objects.filter(
+                        uid=expired_uid_bucket['uid']).delete()  # 删除sts记录
+            except Exception:
+                continue
+        return response.json(0)

Controller/TestApi.py

@@ -133,8 +133,6 @@ class testView(View):
         elif operation == 'rekognition':
             userID = '158943604783713800138000'
             return self.testRekognition(request,request_dict)
-        elif operation == 'deleteDevice':
-            return self.delete_device(response)
         elif operation == 'ip':
             return self.ip(response)
         elif operation == 'configType':
@@ -827,33 +825,6 @@ class testView(View):
         return HttpResponse(json.dumps(response, ensure_ascii=False),
                             content_type="application/json,charset=utf-8")
 
-    def delete_device(self, response):
-        # 定时删除测试账号下的设备数据
-        try:
-            userID_list = ['tech01@ansjer.com', 'tech02@ansjer.com', 'tech03@ansjer.com', 'tech04@ansjer.com',
-                           'tech05@ansjer.com', 'tech06@ansjer.com', 'tech07@ansjer.com', 'tech08@ansjer.com',
-                           'tech09@ansjer.com', 'tech10@ansjer.com', 'fix01@ansjer.com', 'fix02@ansjer.com',
-                           'fix03@ansjer.com', 'fix04@ansjer.com', 'fix05@ansjer.com']
-            device_user = Device_User.objects.filter(username__in=userID_list)
-            device_info_qs = Device_Info.objects.filter(userID__in=device_user).values('UID')
-            uid_list = []
-            for device_info in device_info_qs:
-                uid_list.append(device_info['UID'])
-            with transaction.atomic():
-                # 删除设备云存相关数据
-                UidSetModel.objects.filter(uid__in=uid_list).delete()
-                UID_Bucket.objects.filter(uid__in=uid_list).delete()
-                Unused_Uid_Meal.objects.filter(uid__in=uid_list).delete()
-                Order_Model.objects.filter(UID__in=uid_list).delete()
-                StsCrdModel.objects.filter(uid__in=uid_list).delete()
-                VodHlsModel.objects.filter(uid__in=uid_list).delete()
-                ExperienceContextModel.objects.filter(uid__in=uid_list).delete()
-                Device_Info.objects.filter(userID__in=device_user).delete()
-
-            return response.json(0)
-        except Exception as e:
-            return response.json(500, repr(e))
-
     def ip(self, response):
         ip = '67.220.90.13'
         country_id = Device_Region().get_device_region(ip)