删除多余代码

AnsjerPush/urls.py

@@ -1,4 +1,3 @@
-from django.conf.urls import url
 from django.urls import path
 
 from Controller import DetectController, ShadowController, DetectControllerV2, AiController, gatewayController, \
@@ -6,13 +5,14 @@ from Controller import DetectController, ShadowController, DetectControllerV2, A
 from Controller.ComboCron import ComboCronPushController
 
 urlpatterns = [
-    path('deviceShadow/update', ShadowController.update_device_shadow),
     path('deviceShadow/generateUTK', ShadowController.generate_utk),
+    path('deviceShadow/update', ShadowController.update_device_shadow),
+
     path('notify/push', DetectController.NotificationView.as_view()),
     path('notifyV2/push', DetectControllerV2.NotificationV2View.as_view()),
     path('notifyV2/powerWarningPush', PowerWarningController.PowerWarningView.as_view()),
 
-    url(r'^AiService/(?P<operation>.*)$', AiController.AiView.as_view()),
-    url(r'^gatewayService/(?P<operation>.*)$', gatewayController.GatewayView.as_view()),
-    url('unicom/device/combo/(?P<operation>.*)$', ComboCronPushController.ComboCronPushView.as_view())
+    path(r'^AiService/(?P<operation>.*)$', AiController.AiView.as_view()),
+    path(r'^gatewayService/(?P<operation>.*)$', gatewayController.GatewayView.as_view()),
+    path('unicom/device/combo/(?P<operation>.*)$', ComboCronPushController.ComboCronPushView.as_view())
 ]

Controller/AiController.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@software: PyCharm
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-"""
 import base64
 import json
 import logging

Controller/DetectController.py

@@ -1,16 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/1/14 15:57
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: DetectController.py
-@Contact: chanjunkai@163.com
-"""
 import logging
 import os
 import time

Controller/ShadowController.py

@@ -14,6 +14,15 @@ from Service.CommonService import CommonService
 
 
 def generate_utk(request):
+    """
+    uid生成etk
+    app测试使用
+    @param request: 请求
+    @request username: username
+    @request password: password
+    @request uid: uid
+    @return : etk
+    """
     request.encoding = 'utf-8'
     response = ResponseObject()
     if request.method == 'GET':
@@ -36,8 +45,12 @@ def generate_utk(request):
         return response.json(444, 'username password')
 
 
-# 更新设备影子
 def update_device_shadow(request):
+    """
+    设备生成或更新(复位时)设备影子
+    @param request: 请求
+    @return : JsonResponse
+    """
     request.encoding = 'utf-8'
     if request.method == 'POST':
         request_dict = request.POST
@@ -186,6 +199,11 @@ def update_device_shadow(request):
 
 
 def do_request_thread(domain_name_list, data):
+    """
+    请求线程
+    @param domain_name_list: 域名列表
+    @param data: 请求数据
+    """
     for domain_name in domain_name_list:
         url = 'http://{}/deviceShadow/update'.format(domain_name)
         requests.post(url=url, data=data, timeout=2)

Model/models.py

@@ -1,8 +1,6 @@
 from itertools import chain
 from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
 from django.db import models
-# from django.utils import six
-# from django.utils.encoding import python_2_unicode_compatible
 from six import python_2_unicode_compatible
 from imagekit.models import ProcessedImageField
 
@@ -66,10 +64,6 @@ class Permissions(models.Model):
     description = models.CharField(blank=True, null=True, max_length=128, verbose_name=u'描述信息', default='')
     objects = PermissionsManager()
 
-    def __str__(self):
-        return "%s" % (
-            six.text_type(self.description))
-
     class Meta:
         ordering = ['permName']
         db_table = 'permissions'
@@ -209,7 +203,6 @@ class Device_User(AbstractBaseUser):
 
     def get_all_permission(self):
         roles = self.role.all()
-        perms = self.permission.all()
 
         permslist = []
         for role in roles:
@@ -219,9 +212,6 @@ class Device_User(AbstractBaseUser):
                     permslist.append(perm.permName)
                 return permslist
 
-        for perm in perms:
-            permslist.append(perm.permName)
-
         permSet = set(permslist)
         for role in roles:
             permlist_tmp = []