App诊断日志

Ansjer/urls.py

@@ -10,7 +10,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     StsOssController, UIDPreview, OssCrd, SysMsg, UidUser, EquipmentManagerV2, EquipmentManagerV3, PushDeploy, \
     AppSetController, \
     ApplicationController, UserExController, CloudStorage, TestApi, UserBrandControllerV2, \
-    StatisticsController, Alexa, FAQController
+    StatisticsController, Alexa, FAQController, AppLogController
 
 urlpatterns = [
     url(r'^testApi/(?P<operation>.*)$', TestApi.testView.as_view()),
@@ -229,6 +229,8 @@ urlpatterns = [
 
     # 苹果登录
     url(r'^ios/authsign', UserController.AppleAuthLogin.as_view()),
+    url(r'^appLog/(?P<operation>.*)$', AppLogController.AppLogView.as_view()),
+
 
     # app 设备消息模板
     # 路由加参数参考

Controller/AppLogController.py

@@ -0,0 +1,145 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import time
+
+import oss2
+from django.views.generic.base import View
+
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
+from Model.models import AppLogModel
+from Object.ResponseObject import ResponseObject
+from Object.TokenObject import TokenObject
+from Service.CommonService import CommonService
+from Service.ModelService import ModelService
+
+
+class AppLogView(View):
+
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation', None)
+        return self.validate(request.GET, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation', None)
+        return self.validate(request.POST, operation)
+
+    def validate(self, request_dict, operation):
+        token = request_dict.get('token', None)
+        response = ResponseObject()
+        if token is None:
+            return response.json(444)
+
+        token = TokenObject(token)
+        if token.code != 0:
+            return response.json(token.code)
+
+        if operation == 'getUploadUrl':
+            return self.get_upload_url(token.userID, request_dict, response)
+        elif operation == 'add':
+            return self.do_add(token.userID, request_dict, response)
+        elif operation == 'queryByAdmin':
+            return self.do_query_by_admin(token.userID, request_dict, response)
+        elif operation == 'deleteByAdmin':
+            return self.do_delete_by_admin(token.userID, request_dict, response)
+        elif operation == 'downloadByAdmin':
+            return response.json(404)
+        else:
+            return response.json(414)
+
+    def get_upload_url(self, userID, request_dict, response):
+        upload_type = request_dict.get('upload_type', None)
+        if upload_type:
+            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
+            name = CommonService.createOrderID()
+            filename = str(name) + '.' + upload_type
+            obj = 'app_log/{userID}/'.format(userID=userID) + filename
+
+            url = bucket.sign_url('PUT', obj, 7200)
+            return response.json(0, {'put_url': url, 'filename': filename})
+        else:
+            return response.json(444)
+
+    def do_add(self, userID, request_dict, response):
+        uid = request_dict.get('uid', None)
+        average_delay = request_dict.get('average_delay', None)
+        status = request_dict.get('status', None)
+        filename = request_dict.get('filename', None)
+
+        if uid is None or average_delay is None or status is None or filename is None:
+            return response.json(444)
+        else:
+            now_time = int(time.time())
+            data = {
+                'uid': uid,
+                'average_delay': average_delay,
+                'status': status,
+                'filename': filename,
+                'add_time': now_time,
+                'user_id': userID,
+            }
+            AppLogModel.objects.create(**data)
+            return response.json(0)
+
+    def do_query_by_admin(self, userID, request_dict, response):
+        own_perm = ModelService.check_perm(userID, 30)
+        if own_perm:
+            page = request_dict.get('page', None)
+            line = request_dict.get('line', None)
+            status = request_dict.get('status', None)
+            uid = request_dict.get('uid', None)
+
+            if page and line:
+                page = int(page)
+                line = int(line)
+                filter_data = {}
+                if status:
+                    filter_data['status'] = status
+                if uid:
+                    filter_data['uid'] = uid
+
+                al_qs = AppLogModel.objects.filter(**filter_data).order_by('-add_time')
+
+                if al_qs.exists():
+                    count = al_qs.count()
+                    start = (page - 1) * line
+                    al_qs = al_qs[start: (start + line)].values()
+
+                    res = []
+                    auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+                    bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
+                    for al in al_qs:
+                        filename = al['filename']
+                        obj = 'app_log/' + al['user_id'] + '/' + filename
+                        url = bucket.sign_url('GET', obj, 3600)
+                        al['url'] = url
+                        del al['filename']
+                        res.append(al)
+
+                    return response.json(0, {'datas': res, 'count': count})
+                else:
+                    return response.json(0, {'datas': [], 'count': 0})
+            else:
+                return response.json(444, 'page, line')
+        else:
+            return response.json(404)
+
+    def do_delete_by_admin(self, userID, request_dict, response):
+        own_perm = ModelService.check_perm(userID, 10)
+        if own_perm:
+            id = request_dict.get('id', None)
+            if id:
+                try:
+                    AppLogModel.objects.filter(id=id).delete()
+                except Exception as e:
+                    print(repr(e))
+                    return response.json(500, repr(e))
+                else:
+                    return response.json(0)
+            else:
+                return response.json(444)
+        else:
+            return response.json(404)
+

Model/models.py

@@ -972,4 +972,19 @@ class FAQModel(models.Model):
     class Meta:
         db_table = 'tb_faq'
         verbose_name = '问题帮助表'
-        verbose_name_plural = verbose_name
+        verbose_name_plural = verbose_name
+
+
+class AppLogModel(models.Model):
+    id = models.AutoField(primary_key=True)
+    user = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE, verbose_name='关联设备用户表')
+    uid = models.CharField(max_length=20, default='', verbose_name='设备uid')
+    average_delay = models.CharField(max_length=32, default='', verbose_name='最高平均延时')
+    status = models.SmallIntegerField(default=0, verbose_name='失败状态')
+    filename = models.CharField(max_length=120, default='', verbose_name='文件名')
+    add_time = models.IntegerField(default=0, verbose_name='日期')
+
+    class Meta:
+        db_table = 'app_log'
+        verbose_name = 'APP日志表'
+        verbose_name_plural = verbose_name