fix:bug

Ansjer/urls.py

@@ -5,7 +5,7 @@ from Controller import FeedBackInfo, EquipmentOTA, EquipmentInfo, EquipmentSenso
     AccessLog, Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, AppColophon,\
     EquipmentManager, LogManager, PermissionManager, OTAEquipment, UidappController, shareUserPermission, \
     UserManger, CheckUserData, \
-    UserController, CloudVod, OrderContrller, VodBucket, DetectController,DeviceShare,UserBrandController,StsOssController
+    UserController, CloudVod, OrderContrller, VodBucket, DetectController,DeviceShare,UserBrandController,StsOssController,UIDPreview
 
 urlpatterns = [
     url(r'^account/authcode$', UserController.authCodeView.as_view()),
@@ -134,7 +134,7 @@ urlpatterns = [
 
     # 用户反馈信息
     url(r'^feedback/(?P<operation>.*)$', FeedBackInfo.FeedBackInfoView.as_view()),
-    url(r'^uidpreview/(?P<operation>.*)$', EquipmentStatus.addUIDPreview),
+    url(r'^uidpreview/(?P<operation>.*)$', UIDPreview.UIDPreview.as_view()),
 
     # 新的设备接口
     path('Test', Test.Test.as_view()),

Controller/EquipmentManager.py

@@ -4,13 +4,13 @@ import traceback
 
 import simplejson as json
 from django.utils import timezone
-from Model.models import Device_User, Device_Info, UID_Bucket, UID_App,UID_Preview
+from Model.models import Device_User, Device_Info, UID_Bucket, UID_App, UID_Preview
 from django.db.models import Q
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-from Ansjer.config import OSS_STS_ACCESS_SECRET,OSS_STS_ACCESS_KEY
+from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 import oss2
 
 
@@ -589,7 +589,7 @@ def queryInterface(request):
                 uid_list.append(dvl['UID'])
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
-        upqs = UID_Preview.objects.filter(uid__in=uid_list).values('id','uid','channel')
+        upqs = UID_Preview.objects.filter(uid__in=uid_list).values('id', 'uid', 'channel')
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         uidPreview_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
         nowTime = int(time.time())

Controller/EquipmentStatus.py

@@ -120,61 +120,61 @@ def getTZ(request):
     else:
         return JsonResponse(status=200, data={'code': 444, 'msg': '接口参数错误 etk'})
 
-
-# 设备预览图
-def addUIDPreview(request):
-    request.encoding = 'utf-8'
-    response = ResponseObject()
-    if request.method == 'GET':
-        request_dict = request.GET
-    elif request.method == 'POST':
-        request_dict = request.POST
-    else:
-        return response.json(414)
-    channel = request_dict.get('channel')
-    uid = request_dict.get('channel')
-    token = request_dict.get('token')
-    if all([token, uid, channel]):
-        tko = TokenObject(token)
-        if tko.code == 0:
-            nowTime = int(time.time())
-            upqs = UID_Preview.objects.filter(uid=uid, channel=channel)
-            if upqs.exists():
-                try:
-                    is_update = upqs.update(updTime=nowTime)
-                except Exception as e:
-                    print(repr(e))
-                    return response.json(177)
-                else:
-                    if is_update:
-                        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-                        bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
-                        obj = 'uid_preview/{uid}/{channel}.jpeg'.format(uid=uid, channel=channel)
-                        # 设置此签名URL在60秒内有效。
-                        url = bucket.sign_url('PUT', obj, 7200)
-                        return response.json(0, url)
-                    else:
-                        return response.json(177)
-            else:
-                create_data = {
-                    'addTime': nowTime,
-                    'updTime': nowTime,
-                    'uid': uid,
-                    'channel': channel
-                }
-                try:
-                    UID_Preview.objects.create(**create_data)
-                except Exception as e:
-                    print(repr(e))
-                    return response.json(178)
-                else:
-                    auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-                    bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
-                    obj = 'uid_preview/{uid}/{channel}.jpeg'.format(uid=uid, channel=channel)
-                    # 设置此签名URL在60秒内有效。
-                    url = bucket.sign_url('PUT', obj, 7200)
-                    return response.json(0, url)
-        else:
-            return response.json(tko.code)
-    else:
-        return response.json(444)
+#
+# # 设备预览图
+# def addUIDPreview(request):
+#     request.encoding = 'utf-8'
+#     response = ResponseObject()
+#     if request.method == 'GET':
+#         request_dict = request.GET
+#     elif request.method == 'POST':
+#         request_dict = request.POST
+#     else:
+#         return response.json(414)
+#     channel = request_dict.get('channel')
+#     uid = request_dict.get('channel')
+#     token = request_dict.get('token')
+#     if all([token, uid, channel]):
+#         tko = TokenObject(token)
+#         if tko.code == 0:
+#             nowTime = int(time.time())
+#             upqs = UID_Preview.objects.filter(uid=uid, channel=channel)
+#             if upqs.exists():
+#                 try:
+#                     is_update = upqs.update(updTime=nowTime)
+#                 except Exception as e:
+#                     print(repr(e))
+#                     return response.json(177)
+#                 else:
+#                     if is_update:
+#                         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+#                         bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
+#                         obj = 'uid_preview/{uid}/{channel}.jpeg'.format(uid=uid, channel=channel)
+#                         # 设置此签名URL在60秒内有效。
+#                         url = bucket.sign_url('PUT', obj, 7200)
+#                         return response.json(0, url)
+#                     else:
+#                         return response.json(177)
+#             else:
+#                 create_data = {
+#                     'addTime': nowTime,
+#                     'updTime': nowTime,
+#                     'uid': uid,
+#                     'channel': channel
+#                 }
+#                 try:
+#                     UID_Preview.objects.create(**create_data)
+#                 except Exception as e:
+#                     print(repr(e))
+#                     return response.json(178)
+#                 else:
+#                     auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+#                     bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
+#                     obj = 'uid_preview/{uid}/{channel}.jpeg'.format(uid=uid, channel=channel)
+#                     # 设置此签名URL在60秒内有效。
+#                     url = bucket.sign_url('PUT', obj, 7200)
+#                     return response.json(0, url)
+#         else:
+#             return response.json(tko.code)
+#     else:
+#         return response.json(444)