加多了一个ip

Controller/UserBrandController.py

@@ -24,10 +24,12 @@ class UserBrandInfo(View):
 
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
+        self.clientIP = CommonService.get_ip_address(request)
         return self.validation(request_dict=request.GET)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
+        self.clientIP = CommonService.get_ip_address(request)
         return self.validation(request_dict=request.POST)
 
     def validation(self, request_dict, *args, **kwargs):
@@ -54,13 +56,19 @@ class UserBrandInfo(View):
                 return response.json(tko.code)
         else:
             return response.json(309)
+            # 获取外网IP
 
-    # http://192.168.136.39:8000/userbrandinfo?operation=add&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiY24iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NTk4OTY4NTd9.nhK3VSghSGjyXKjel4woz7R_3bhjgqQDlX-ypYsklNU&deviceSupplier=12341234&deviceModel=deviceModel&osType=osType&osVersion=osVersion
+
+
+
+    # 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):
         deviceSupplier = request_dict.get('deviceSupplier', None)
         deviceModel = request_dict.get('deviceModel', None)
         osType = request_dict.get('osType', None)
         osVersion = request_dict.get('osVersion', None)
+
+        print(self.clientIP)
         try:
             user_brand = User_Brand(
                 userID=Device_User.objects.get(userID=userID),
@@ -68,6 +76,7 @@ class UserBrandInfo(View):
                 deviceModel=deviceModel,
                 osType=osType,
                 osVersion=osVersion,
+                ip=self.clientIP,
                 addTime = int(time.time())
             )
             user_brand.save()
@@ -111,12 +120,20 @@ class UserBrandInfo(View):
 
                 print (user_brand_queryset)
                 addtime=[]
+                send_jsons=[]
+                counts=0
                 for i in user_brand_queryset:
+                    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
+                    send_jsons.append(user_brand_querysetlast["datas"][0])
+
                 print(addtime)
-                user_brand_queryset = User_Brand.objects.filter(userID__in = user_brand_queryset, addTime__in=addtime).order_by(order)
+                print(1111111111)
+                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]
@@ -125,7 +142,7 @@ class UserBrandInfo(View):
                         username = ModelService.get_user_name(userID=send_json["datas"][k]['fields']['userID'])
                         send_json["datas"][k]['fields']['username']=username
                     send_json['count'] = count
-                    return response.json(0, send_json)
+                    return response.json(0, {'datas': send_jsons, 'count': counts})
                 return response.json(0, {'datas': [], 'count': 0})
             else:
                 return response.json(404)

Model/models.py

@@ -389,6 +389,7 @@ class User_Brand(models.Model):
     deviceModel = models.CharField(max_length=32, default='', verbose_name='（必填）设备型号 string @mock=HM NOTE 1TD')
     osType = models.CharField(max_length=32, default='', verbose_name='（必填）操作系统名称 string @mock=Android')
     osVersion = models.CharField(max_length=32, default='', verbose_name='（必填）操作系统版本号 string @mock=4.0')
+    ip = models.CharField(blank=True,max_length=20,default='',verbose_name=u'区域ip')
     addTime = models.IntegerField( verbose_name='添加时间', default=0)
     def __str__(self):
         return self.id