tt

Controller/EquipmentStatus.py

@@ -94,9 +94,10 @@ def getTZ(request):
     else:
         return JsonResponse(status=200, data={'code': 403, 'msg': '接口请求方法错误'})
     c = request_dict.get('etk', None)
-    # ip = request_dict.get('ip', None)
+    ip = request_dict.get('ip', None)
     lang = request_dict.get('lang', None)
-    ip = CommonService.get_ip_address(request)
+    if not ip:
+        ip = CommonService.get_ip_address(request)
     if c:
         c = base64.b64decode(c)
         c = c[2:-2]

Controller/StsOssController.py

@@ -39,10 +39,14 @@ class StsOssView(View):
         token = request_dict.get('token', None)
         tko = TokenObject(token)
         if tko.code == 0:
-            return self.uid_preview()
+            userID = tko.userID
+            return self.uid_preview(userID)
         else:
             return response.json(tko.code)
 
-    def uid_preview(self):
+    #
+    def uid_preview(self,userID):
+        storage = '{userID}/uid_preview/'
+        bucket_name = 'apge'
 
         return

Controller/UserBrandController.py

@@ -2,12 +2,13 @@ from django.views.generic.base import View
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from Service.ModelService import ModelService
-from Model.models import User_Brand,Device_User
+from Model.models import User_Brand, Device_User
 from django.utils import timezone
-import traceback,time
+import traceback, time
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
+
 '''
 
 http://192.168.136.45:8077/userbrandinfo?operation=query&token=test&page=1&line=10
@@ -43,13 +44,13 @@ class UserBrandInfo(View):
                 operation = request_dict.get('operation', None)
                 if userID is not None:
                     if operation == 'query':
-                        return self.query_info(request_dict, userID,response)
+                        return self.query_info(request_dict, userID, response)
                     elif operation == 'add':
-                        return self.add_info(request_dict, userID,response)
+                        return self.add_info(request_dict, userID, response)
                     elif operation == 'queryAll':
-                        return self.query_all_info(request_dict, userID,response)
+                        return self.query_all_info(request_dict, userID, response)
                     else:
-                        return response.json(444,'444')
+                        return response.json(444, '444')
                 else:
                     return response.json(309)
             else:
@@ -58,11 +59,8 @@ class UserBrandInfo(View):
             return response.json(309)
             # 获取外网IP
 
-
-
-
     # http://192.168.136.39:8000/userbrandinfo?operation=add&token=test&deviceSupplier=12341234&deviceModel=deviceModel&osType=osType&osVersion=osVersion
-    def add_info(self, request_dict, userID,response):
+    def add_info(self, request_dict, userID, response):
         deviceSupplier = request_dict.get('deviceSupplier', None)
         deviceModel = request_dict.get('deviceModel', None)
         osType = request_dict.get('osType', None)
@@ -77,7 +75,7 @@ class UserBrandInfo(View):
                 osType=osType,
                 osVersion=osVersion,
                 ip=self.clientIP,
-                addTime = int(time.time())
+                addTime=int(time.time())
             )
             user_brand.save()
         except Exception:
@@ -86,10 +84,9 @@ class UserBrandInfo(View):
             return response.json(424, {'details': errorInfo})
         else:
             print(type(user_brand.addTime))
-            return response.json(0,{'id':user_brand.id})
-
+            return response.json(0, {'id': user_brand.id})
 
-    def query_info(self, request_dict, userID,response):
+    def query_info(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         param_flag = CommonService.get_param_flag(data=[page, line])
@@ -105,42 +102,44 @@ class UserBrandInfo(View):
         else:
             return response.json(444)
 
-
-    def query_all_info(self, request_dict, userID,response):
+    def query_all_info(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
-        order = request_dict.get('order','-id')
+        order = request_dict.get('order', '-id')
         if order == '':
-            order ='-id'
+            order = '-id'
         param_flag = CommonService.get_param_flag(data=[page, line])
         if param_flag is True:
-            check_perm = ModelService.check_perm(userID=userID,permID=30)
+            check_perm = ModelService.check_perm(userID=userID, permID=30)
             if check_perm is True:
-                user_brand_queryset = User_Brand.objects.all().order_by('userID').values_list('userID', flat=True).distinct()
+                user_brand_queryset = User_Brand.objects.all().order_by('userID').values_list('userID',
+                                                                                              flat=True).distinct()
 
-                print (user_brand_queryset)
-                addtime=[]
-                send_jsons=[]
-                counts=0
+                print(user_brand_queryset)
+                addtime = []
+                send_jsons = []
+                counts = 0
                 for i in user_brand_queryset:
-                    counts=counts+1
+                    counts = counts + 1
                     user_brand_querysetlast = User_Brand.objects.filter(userID=i).order_by(order)[:1]
                     user_brand_querysetlast = CommonService.qs_to_dict(user_brand_querysetlast)
                     addtime.append(user_brand_querysetlast["datas"][0]['fields']['addTime'])
-                    username = ModelService.get_user_name(userID=user_brand_querysetlast["datas"][0]['fields']['userID'])
-                    user_brand_querysetlast["datas"][0]['fields']['username']=username
+                    username = ModelService.get_user_name(
+                        userID=user_brand_querysetlast["datas"][0]['fields']['userID'])
+                    user_brand_querysetlast["datas"][0]['fields']['username'] = username
                     send_jsons.append(user_brand_querysetlast["datas"][0])
 
                 print(addtime)
                 print(1111111111)
-                user_brand_queryset =   User_Brand.objects.filter(userID__in = user_brand_queryset, addTime__in=addtime).order_by(order)
+                user_brand_queryset = User_Brand.objects.filter(userID__in=user_brand_queryset,
+                                                                addTime__in=addtime).order_by(order)
                 if user_brand_queryset.exists():
                     count = user_brand_queryset.count()
                     res = user_brand_queryset[(page - 1) * line:page * line]
                     send_json = CommonService.qs_to_dict(res)
                     for k, v in enumerate(send_json["datas"]):
                         username = ModelService.get_user_name(userID=send_json["datas"][k]['fields']['userID'])
-                        send_json["datas"][k]['fields']['username']=username
+                        send_json["datas"][k]['fields']['username'] = username
                     send_json['count'] = count
                     return response.json(0, {'datas': send_jsons, 'count': counts})
                 return response.json(0, {'datas': [], 'count': 0})