1

Controller/AccessLog.py

@@ -3,7 +3,6 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from Service.TokenManager import JSONTokenManager
 from Service.ModelService import ModelService
-from Service.CommonService import CommonService
 from Model.models import Access_Log
 import datetime
 from var_dump import var_dump

Controller/EquipmentManager.py

@@ -39,9 +39,9 @@ def addNewUserEquipment(userID, deviceContent, bulk = False):
             else:
                 UID = deviceData.get('UID', None)
                 if UID != None:
-                    # is_bind = Device_Info.objects.filter(UID = UID,isShare=False)
-                    # if is_bind:
-                    #     return ResponseFormal(175)
+                    is_bind = Device_Info.objects.filter(UID = UID,isShare=False)
+                    if is_bind:
+                        return ResponseFormal(175)
                     dValid = Device_Info.objects.filter(userID = userID, UID = UID)
                     if dValid:
                         return ResponseFormal(174)

Controller/LogAccess.py

@@ -12,16 +12,13 @@
 @Contact: chanjunkai@163.com
 """
 from Service.TokenManager import JSONTokenManager
-from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Object.mongodb import mongodb
 from django.views.decorators.csrf import csrf_exempt
-from var_dump import var_dump
 from Service.ResponseService import *
 
 @csrf_exempt
 def LogAccess(request):
-    # 查找设备日志
     if request.method == 'GET':
         request.encoding = 'utf-8'
         token = request.GET.get('token', None)

Controller/UserManger.py

@@ -665,7 +665,6 @@ class perfectUserInfoView(TemplateView):
         userContent = request.POST.get('content', None)
         userIcon = request.FILES.get('userIcon', None)
         token = request.POST.get('token', None)
-        var_dump(userIcon)
         return self.ValidationError(token, userContent, userIcon)
 
     def get(self, request, *args, **kwargs):

Model/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from itertools import chain
 from django.utils import six
 from imagekit.processors import ResizeToFill
 from imagekit.models import ProcessedImageField
@@ -363,6 +364,8 @@ class Device_Info(models.Model):
 
         import simplejson as json
         return json.dumps(data,ensure_ascii=False)
+    
+    '''
     def model_to_dict(self, fields=None, exclude=None):
         opts = self._meta
         data = {}
@@ -375,7 +378,7 @@ class Device_Info(models.Model):
                 continue
             data[f.name] = f.value_from_object(self)
         return data
-    '''
+
     class Meta:
         db_table = 'device_info'
         ordering = ('-data_joined',)