新增删除访问日志API，问卷查询新增统计总数

AdminController/SurveysManageController.py

@@ -286,6 +286,8 @@ class SurveysView(View):
             cursor.execute(sql, [1, 0, ])
             cloud_count = cursor.fetchall()
             total = len(cloud_count)
+            readCount = SurveysUserLog.objects.count()
+            unreadCount = total - readCount
             sql += 'order by ca.created_time DESC,orderID DESC LIMIT %s,%s '
             cursor.execute(sql, [1, 0, ((page - 1) * size), size, ])
             data_obj = cursor.fetchall()
@@ -313,7 +315,8 @@ class SurveysView(View):
                     tMap.update({"createdTime": ''})
                     tMap.update({"isUpgrade": 0})
                 result_list.append(tMap)
-            return response.json(0, {'list': result_list, 'total': total})
+            return response.json(0, {'list': result_list, 'total': total, 'readCount': readCount,
+                                     'unreadCount': unreadCount})
         except Exception as e:
             print(e)
             return response.json(500, repr(e))

Ansjer/test/postest.py

@@ -20,7 +20,7 @@ data['appBundleId'] = 'com.ansjer.zccloud_ab'
 data['tz'] = '+08.00'
 data['uid'] = 'HLK7EJ2VYLNHHUMG111A'
 data['status'] = '1'
-data['m_code'] = 'AN02000025070000001207.zccloud_ab'
+data['m_code'] = 'AN025070000001207.zccloud_ab'
 data['token'] = 'local'
 data['lang'] = 'cn'
 data['app_type'] = '2'

Ansjer/urls.py

@@ -21,6 +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 AdminController import UserManageController, RoleController, MenuController, TestServeController, \
     ServeManagementController, LogManagementController, DeviceManagementController, VersionManagementController, \
     AiServeController, SurveysManageController
@@ -167,6 +168,7 @@ urlpatterns = [
     url(r'^deviceShadow/generateUTK$', ShadowController.generate_utk),
     url(r'^test/notify/push$', TestDetectController.NotificationView.as_view()),
     url(r'^eq/del$', EquipmentInfo.deleteExpireEquipmentInfo),
+    url(r'^eq/log/del$', CronDelDataController.deleteExpireAccessLog),
     # 新增
     url(r'^cloudVod/(?P<operation>.*)$', CloudVod.CloudVodView.as_view()),
     url(r'^meal/(?P<operation>.*)$', MealManage.MealView.as_view()),

Controller/Cron/CronDelDataController.py

@@ -0,0 +1,30 @@
+#!/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
+from django.db import connection
+
+from Object.ResponseObject import ResponseObject
+from Object.utils import LocalDateTimeUtil
+
+
+def deleteExpireAccessLog(request):
+    response = ResponseObject()
+    try:
+        print(request)
+        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))

Object/AWS/ElasticTranscoder.py

@@ -34,7 +34,7 @@ class ElasticTranscoder:
             Outputs=[
                 {
                     'Key': OutputKey,
-                    'PresetId': '1351620000001-200010',
+                    'PresetId': '13516001-200010',
                     'SegmentDuration': '2',
                 }
             ]

Object/utils/LocalDateTimeUtil.py

@@ -27,8 +27,10 @@ def get_last_first_date_and_last_date(n):
 def get_today_date(timestamp=False):
     """
     返回当天开始时间和结束时间
-    :param timestamp 是否返回时间戳
-    :returns: zero_today ,last_today
+    Args:
+        timestamp 是否返回时间戳
+    returns:
+        zero_today ,last_today
     """
 
     now = datetime.datetime.now()
@@ -42,6 +44,18 @@ def get_today_date(timestamp=False):
     return zero_today, last_today
 
 
+def get_last_month():
+    """
+    获取前一个月时间
+    returns:
+        last_month_date
+    """
+    today = datetime.date.today()  # 1. 获取「今天」
+    last_month = today.replace(month=today.month - 1)  # 2.获取前一个月
+    last_month_date = last_month.strftime("%Y-%m-%d %H:%M:%S")
+    return last_month_date
+
+
 if __name__ == "__main__":
     start_time, end_time = get_today_date(True)
     print('--- start_time = {} end_time = {}'.format(start_time, end_time))

Service/DeviceOperation.py

@@ -31,7 +31,7 @@ class DeviceOperation:
             "0x10019": 'LOG_TYPE_MANUAL_SNAP_FAIL',  # 手动抓图失败
 
             # setup 系统配置
-            "0x20000": 'LOG_TYPE_CONFIG',
+            "0x": 'LOG_TYPE_CONFIG',
             "0x20001": 'LOG_TYPE_CHGE_VIDEO_FORMAT',  # 改变视频制式
             "0x20002": 'LOG_TYPE_CHGE_VGA_RESOLUTION',  # 改变显示器分辨率
             "0x20003": 'LOG_TYPE_CHGE_LANGUAGE',  # 调整语言
@@ -136,14 +136,14 @@ class DeviceOperation:
             "0x100009": 'LOG_TYPE_UNLOCK_PICTURE',  # 解锁图片
 
             # 查看信息(Check Infomantion)
-            "0x200000": 'LOG_TYPE_VIEW_INFO',  # 查看系统信息
-            "0x200001": 'LOG_TYPE_VIEW_SYSTEM',  # 查看系统信息
-            "0x200002": 'LOG_TYPE_VIEW_EVENT',  # 查看事件
-            "0x200003": 'LOG_TYPE_VIEW_LOG',  # 查看日志
-            "0x200004": 'LOG_TYPE_VIEW_NETWORK',  # 查看网络状态
-            "0x200005": 'LOG_TYPE_VIEW_ONLINE_USER',  # 查看在线用户
-            "0x200006": 'LOG_TYPE_VIEW_EXPORT_LOG',  # 导出日志
-            "0x200007": 'LOG_TYPE_VIEW_EXPORT_EVENT',  # 导出事件
+            "0x0": 'LOG_TYPE_VIEW_INFO',  # 查看系统信息
+            "0x1": 'LOG_TYPE_VIEW_SYSTEM',  # 查看系统信息
+            "0x2": 'LOG_TYPE_VIEW_EVENT',  # 查看事件
+            "0x3": 'LOG_TYPE_VIEW_LOG',  # 查看日志
+            "0x4": 'LOG_TYPE_VIEW_NETWORK',  # 查看网络状态
+            "0x5": 'LOG_TYPE_VIEW_ONLINE_USER',  # 查看在线用户
+            "0x6": 'LOG_TYPE_VIEW_EXPORT_LOG',  # 导出日志
+            "0x7": 'LOG_TYPE_VIEW_EXPORT_EVENT',  # 导出事件
 
             # 异常信息(Error)
             "0x400000": 'LOG_TYPE_ERROR_INFO',  # 网络地址冲突
@@ -178,11 +178,11 @@ class DeviceOperation:
     def getODla(search_class):
         data = {
             'Operation': ['0x10000', '0x10019'], #操作
-            'Setup': ['0x20000', '0x20048'], #系统配置
+            'Setup': ['0x', '0x20048'], #系统配置
             'Playback': ['0x40000', '0x40008'], #录像回放
             'Backup': ['0x80000', '0x80004'], #数据备份
             'Search': ['0x100001', '0x100009'], #录像检索
-            'Check Infomantion': ['0x200000', '0x200007'], #查看信息
+            'Check Infomantion': ['0x0', '0x7'], #查看信息
             'Error': ['0x400000', '0x40000C'], #异常信息
             'Event': ['0x800000', '0x800010'], #事件信息
         }