ipip

Ansjer/urls.py

@@ -72,7 +72,7 @@ urlpatterns = [
     url(r'^equipment/info', EquipmentInfo.EquipmentInfo.as_view()),
     url(r'^adminManage/manage', AdminManage.AdminManage.as_view()),  # 管理员专属view
     url(r'^equipment/OTA', EquipmentOTA.EquipmentOTA.as_view()),  # OTA重构类
-    url(r'^feedbackInfo', FeedBackInfo.FeedBackInfo.as_view()),  # 用户反馈信息
+    # url(r'^feedbackInfo', FeedBackInfo.FeedBackInfo.as_view()),  # 用户反馈信息
     url(r'^userbrandinfo',UserBrandController.UserBrandInfo.as_view()), # 用户登录的手机端品牌记录统计信息表
 
     url(r'^appInfo', AppInfo.AppInfo.as_view()),  # app版本信息
@@ -129,8 +129,11 @@ urlpatterns = [
     url(r'^user/init$', UserController.InitInfoView.as_view()),
     url(r'^getTZ$', EquipmentStatus.getTZ),
 
+    # oss授权
     url(r'^stsOss/(?P<operation>.*)$',StsOssController.StsOssView.as_view()),
 
+    # 用户反馈信息
+    url(r'^feedback/(?P<operation>.*)$', FeedBackInfo.FeedBackInfoView.as_view()),
     # 新的设备接口
     path('Test', Test.Test.as_view()),
     # 路由加参数参考

Controller/FeedBackInfo.py

@@ -8,66 +8,36 @@ import traceback
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
-'''
-http://192.168.136.45:8077/feedbackInfo?operation=add&token=test&content=12341234
-http://192.168.136.45:8077/feedbackInfo?operation=query&token=test&page=1&line=10
-http://192.168.136.45:8077/feedbackInfo?operation=update&token=test&id=1&content=gggggggggggggggg
-http://192.168.136.45:8077/feedbackInfo?operation=delete&token=test&id=11&id=13&id=14
 
-http://192.168.136.40:8077/feedbackInfo?operation=queryAll&token=test&page=1&line=5
-http://192.168.136.45:8077/feedbackInfo?operation=deleteByAdmin&token=test&id=11&id=13&id=14
-http://192.168.136.45:8077/feedbackInfo?operation=deleteByAdmin&token=test&id=11&id=13&id=14
-http://192.168.136.45:8077/feedbackInfo?operation=updateByAdmin&token=test&id=1&status=1
-'''
-
-
-class FeedBackInfo(View):
-    @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(FeedBackInfo, self).dispatch(*args, **kwargs)
 
+class FeedBackInfoView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
-        return self.validation(request_dict=request.GET)
+        operation = kwargs.get('operation', None)
+        return self.validation(request.GET, operation)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
-        return self.validation(request_dict=request.POST)
+        operation = kwargs.get('operation', None)
+        return self.validation(request.POST, operation)
 
-    def validation(self, request_dict, *args, **kwargs):
+    def validation(self, request_dict, operation):
         response = ResponseObject()
         token = request_dict.get('token', None)
-        if token is not None:
-            tko = TokenObject(token)
-            response.lang = tko.lang
+        tko = TokenObject(token)
+        if operation == 'add':
             if tko.code == 0:
-                userID = tko.userID
-                operation = request_dict.get('operation', None)
-                if userID is not None:
-                    if operation == 'query':
-                        return self.query_info(request_dict, userID,response)
-                    elif operation == 'add':
-                        return self.add_info(request_dict, userID,response)
-                    elif operation == 'update':
-                        return self.update_info(request_dict, userID,response)
-                    elif operation == 'delete':
-                        return self.delete_info(request_dict, userID,response)
-                    elif operation == 'queryAll':
-                        return self.query_all_info(request_dict, userID,response)
-                    elif operation == 'deleteByAdmin':
-                        return self.delete_by_admin(request_dict, userID,response)
-                    elif operation == 'updateByAdmin':
-                        return self.update_by_admin(request_dict, userID,response)
-                    else:
-                        return response.json(444,'444')
-                else:
-                    return response.json(309)
+                return self.do_add(request_dict, response)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(309)
+            return response.json(0, 414)
 
-    def add_info(self, request_dict, userID,response):
+    def do_add(self, request_dict, response):
+
+        return
+
+    def add_info(self, request_dict, userID, response):
         content = request_dict.get('content', None)
         param_flag = CommonService.get_param_flag(data=[content])
         if param_flag is True:
@@ -83,10 +53,10 @@ class FeedBackInfo(View):
                 return response.json(424, {'details': errorInfo})
             else:
                 print(type(feedback_info.add_time))
-                return response.json(0,{'id':feedback_info.id})
+                return response.json(0, {'id': feedback_info.id})
         return response.json(444)
 
-    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])
@@ -102,9 +72,9 @@ class FeedBackInfo(View):
         else:
             return response.json(444)
 
-    def update_info(self, request_dict, userID,response):
+    def update_info(self, request_dict, userID, response):
         content = request_dict.get('content', None)
-        id = request_dict.get('id',None)
+        id = request_dict.get('id', None)
 
         param_flag = CommonService.get_param_flag(data=[id, content])
         if param_flag is True:
@@ -117,29 +87,29 @@ class FeedBackInfo(View):
             else:
                 now_time = timezone.localtime(timezone.now())
                 return response.json(0, {'update_success': 1,
-                                                                                   'update_time': str(now_time)})
+                                         'update_time': str(now_time)})
         else:
             return response.json(444)
 
-    def delete_info(self, request_dict, userID,response):
-        id_list = request_dict.getlist('id',None)
+    def delete_info(self, request_dict, userID, response):
+        id_list = request_dict.getlist('id', None)
         param_flag = CommonService.get_param_flag(data=[id_list])
         if param_flag is True:
             is_delete = Feedback_Info.objects.filter(id__in=id_list, userID=userID).delete()
-            return response.json(0,{'delete_count':is_delete[0]})
+            return response.json(0, {'delete_count': is_delete[0]})
         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')
-        status = request_dict.get('status',None)
+        order = request_dict.get('order', '-id')
+        status = request_dict.get('status', None)
         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:
                 if status is not None:
                     feedback_info_queryset = Feedback_Info.objects.filter(status=status).order_by(order)
@@ -151,7 +121,7 @@ class FeedBackInfo(View):
                     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, send_json)
                 return response.json(0, {'datas': [], 'count': 0})
@@ -160,7 +130,7 @@ class FeedBackInfo(View):
         else:
             return response.json(444)
 
-    def delete_by_admin(self, request_dict, userID,response):
+    def delete_by_admin(self, request_dict, userID, response):
         id_list = request_dict.getlist('id', None)
         param_flag = CommonService.get_param_flag(data=[id_list])
         if param_flag is True:
@@ -173,9 +143,9 @@ class FeedBackInfo(View):
         else:
             return response.json(444)
 
-    def update_by_admin(self, request_dict, userID,response):
-        id = request_dict.get('id',None)
-        status = request_dict.get('status',None)
+    def update_by_admin(self, request_dict, userID, response):
+        id = request_dict.get('id', None)
+        status = request_dict.get('status', None)
         param_flag = CommonService.get_param_flag(data=[id, status])
         if param_flag is True:
             check_perm = ModelService.check_perm(userID=userID, permID=50)
@@ -188,7 +158,7 @@ class FeedBackInfo(View):
                     return response.json(302, {'details': repr(e)})
                 else:
                     now_time = timezone.localtime(timezone.now())
-                    return response.json(0, {'update_id': feedback_info.id,'update_time':str(now_time)})
+                    return response.json(0, {'update_id': feedback_info.id, 'update_time': str(now_time)})
             else:
                 return response.json(404)
         else:

Model/models.py

@@ -348,10 +348,11 @@ class Equipment_Info(models.Model):
 class Feedback_Info(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     userID = models.CharField(blank=True, max_length=32, verbose_name=u'用户ID')
-    status = models.BooleanField(blank=True, default=False, verbose_name=u'状态:0未解决/解决')
+    status = models.SmallIntegerField(default=0, verbose_name='状态:0未解决/解决')
     content = models.TextField(blank=True, null=True, verbose_name=u'反馈描述')
-    add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间/反馈时间', auto_now_add=True)
-    update_time = models.DateTimeField(blank=True, null=True, verbose_name=u'更新时间', auto_now=True)
+    addTime = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间/反馈时间', auto_now_add=True)
+    updTime = models.DateTimeField(blank=True, null=True, verbose_name=u'更新时间', auto_now=True)
+    urls = models.TextField( blank=True, max_length=300, default='', verbose_name=u'存储多张图片的路径')
 
     def __str__(self):
         return self.id
@@ -362,25 +363,6 @@ class Feedback_Info(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
-class User_Feedback(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    # 反馈关联用户
-    userID = models.ForeignKey( Device_User,to_field='userID',on_delete=models.CASCADE)
-    smallInt = models.IntegerField(blank=True, default=0, verbose_name=u'状态:   0未读  1已读')
-    content = models.TextField(blank=True, null=True, default='', verbose_name=u'反馈的内容描述')
-    urls = models.TextField( blank=True, max_length=300, default='', verbose_name=u'存储多张图片的路径')
-    addTime = models.IntegerField( verbose_name='添加时间', default=0)
-    updTime =  models.IntegerField(verbose_name='更新时间', default=0)
-
-    def __str__(self):
-        return self.id
-
-    class Meta:
-        db_table = 'user_feedback'
-        verbose_name = u'用户反馈信息表'
-        verbose_name_plural = verbose_name
-        ordering = ('id',)
-
 class User_Brand(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     # 关联用户

Service/CommonService.py

@@ -3,7 +3,7 @@ import datetime
 import time
 from pathlib import Path
 from random import Random
-
+import ipdb
 import simplejson as json
 from django.core import serializers
 from django.utils import timezone
@@ -96,6 +96,13 @@ class CommonService:
         ts = addr.split('\t')[0]
         return ts
 
+    # 通过ip检索ipip指定信息 lang为CN或EN
+    @staticmethod
+    def getIpIpInfo(ip,lang):
+        db = ipdb.City(BASE_DIR + "/DB/mydata4vipday2.ipdb")
+        info = db.find_map(ip, lang)
+        return info
+
     @staticmethod
     def getUserID(userPhone='13800138000', getUser=True, setOTAID=False, μs=True):
         if μs == True: