Merge branch 'pzb' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

Ansjer/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.urls import path, re_path
 
-from Controller import FeedBackInfo, EquipmentOTA, EquipmentInfo, EquipmentSensor, StreamMedia, AdminManage, AppInfo, \
+from Controller import FeedBack, EquipmentOTA, EquipmentInfo, EquipmentSensor, StreamMedia, AdminManage, AppInfo, \
     AccessLog, Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, AppColophon,\
     EquipmentManager, LogManager, PermissionManager, OTAEquipment, UidappController, shareUserPermission, \
     UserManger, CheckUserData, \
@@ -71,9 +71,6 @@ urlpatterns = [
     url(r'^equipment/sensor', EquipmentSensor.EquipmentSensor.as_view()),  # 设备推送信息
     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'^userbrandinfo/(?P<operation>.*)$',UserBrandController.UserBrandInfo.as_view()), # 用户登录的手机端品牌记录统计信息表
 
     url(r'^appInfo', AppInfo.AppInfo.as_view()),  # app版本信息
     url(r'^accesslog', AccessLog.AccessLog.as_view()),
@@ -133,7 +130,7 @@ urlpatterns = [
     url(r'^stsOss/(?P<operation>.*)$',StsOssController.StsOssView.as_view()),
 
     # 用户反馈信息
-    url(r'^feedback/(?P<operation>.*)$', FeedBackInfo.FeedBackInfoView.as_view()),
+    url(r'^feedback/(?P<operation>.*)$', FeedBack.FeedBackView.as_view()),
     url(r'^uidpreview/(?P<operation>.*)$', UIDPreview.UIDPreview.as_view()),
 
     # 新的设备接口

Controller/EquipmentManager.py

@@ -581,7 +581,7 @@ def queryInterface(request):
         dvql = dvqs[(page - 1) * line:page * line].values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                                           'View_Password', 'ChannelIndex', 'Type', 'isShare',
                                                           'primaryUserID', 'primaryMaster', 'data_joined', 'version',
-                                                          'isVod', 'isExist')
+                                                          'isVod', 'isExist','NotificationMode')
         dvls = CommonService.qs_to_list(dvql)
         uid_list = []
         for dvl in dvls:

Controller/FeedBack.py

@@ -0,0 +1,44 @@
+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 FeedBackModel
+from django.utils import timezone
+import traceback
+from Object.ResponseObject import ResponseObject
+from Object.TokenObject import TokenObject
+from Service.CommonService import CommonService
+
+
+class FeedBackView(View):
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation', None)
+        return self.validation(request.GET, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation', None)
+        return self.validation(request.POST, operation)
+
+    def validation(self, request_dict, operation):
+        response = ResponseObject()
+        token = request_dict.get('token', None)
+        tko = TokenObject(token)
+
+        if operation == 'add':
+            if tko.code == 0:
+                userID = tko.userID
+                return self.do_add(userID, request_dict, response)
+            else:
+                return response.json(tko.code)
+        else:
+            return response.json(0, 414)
+
+    def do_add(self, userID, request_dict, response):
+        content = request_dict.get('content',None)
+        # urls =
+        return
+
+    def do_get_upload_url(self):
+        return 

Controller/FeedBackInfo.py

@@ -1,168 +0,0 @@
-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 Feedback_Info
-from django.utils import timezone
-import traceback
-from Object.ResponseObject import ResponseObject
-from Object.TokenObject import TokenObject
-from Service.CommonService import CommonService
-
-
-class FeedBackInfoView(View):
-    def get(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation', None)
-        return self.validation(request.GET, operation)
-
-    def post(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation', None)
-        return self.validation(request.POST, operation)
-
-    def validation(self, request_dict, operation):
-        response = ResponseObject()
-        token = request_dict.get('token', None)
-        tko = TokenObject(token)
-
-        if operation == 'add':
-            if tko.code == 0:
-                userID = tko.userID
-                return self.do_add(userID, request_dict, response)
-            else:
-                return response.json(tko.code)
-        else:
-            return response.json(0, 414)
-
-    def do_add(self, userID, request_dict, response):
-        content = request_dict.get('content',None)
-        # urls =
-        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:
-            try:
-                feedback_info = Feedback_Info(
-                    userID=userID,
-                    content=content,
-                )
-                feedback_info.save()
-            except Exception:
-                errorInfo = traceback.format_exc()
-                print(errorInfo)
-                return response.json(424, {'details': errorInfo})
-            else:
-                print(type(feedback_info.add_time))
-                return response.json(0, {'id': feedback_info.id})
-        return response.json(444)
-
-    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])
-        if param_flag is True:
-            feedback_info_queryset = Feedback_Info.objects.filter(userID=userID).order_by('-id')
-            if feedback_info_queryset.exists():
-                count = feedback_info_queryset.count()
-                res = feedback_info_queryset[(page - 1) * line:page * line]
-                send_json = CommonService.qs_to_dict(res)
-                send_json['count'] = count
-                return response.json(0, send_json)
-            return response.json(0, {'datas': [], 'count': 0})
-        else:
-            return response.json(444)
-
-    def update_info(self, request_dict, userID, response):
-        content = request_dict.get('content', None)
-        id = request_dict.get('id', None)
-
-        param_flag = CommonService.get_param_flag(data=[id, content])
-        if param_flag is True:
-            try:
-                feedback_info = Feedback_Info.objects.get(userID=userID, id=id)
-                feedback_info.content = content
-                feedback_info.save()
-            except Exception as e:
-                return response.json(10, {'details': repr(e)})
-            else:
-                now_time = timezone.localtime(timezone.now())
-                return response.json(0, {'update_success': 1,
-                                         '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)
-        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]})
-        else:
-            return response.json(444)
-
-    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)
-        if order == '':
-            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)
-            if check_perm is True:
-                if status is not None:
-                    feedback_info_queryset = Feedback_Info.objects.filter(status=status).order_by(order)
-                else:
-                    feedback_info_queryset = Feedback_Info.objects.all().order_by(order)
-                if feedback_info_queryset.exists():
-                    count = feedback_info_queryset.count()
-                    res = feedback_info_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['count'] = count
-                    return response.json(0, send_json)
-                return response.json(0, {'datas': [], 'count': 0})
-            else:
-                return response.json(404)
-        else:
-            return response.json(444)
-
-    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:
-            check_perm = ModelService.check_perm(userID=userID, permID=10)
-            if check_perm is True:
-                is_delete = Feedback_Info.objects.filter(id__in=id_list).delete()
-                return response.json(0, {'delete_count': is_delete[0]})
-            else:
-                return response.json(404)
-        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)
-        param_flag = CommonService.get_param_flag(data=[id, status])
-        if param_flag is True:
-            check_perm = ModelService.check_perm(userID=userID, permID=50)
-            if check_perm is True:
-                try:
-                    feedback_info = Feedback_Info.objects.get(id=id)
-                    feedback_info.status = status
-                    feedback_info.save()
-                except Exception as e:
-                    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)})
-            else:
-                return response.json(404)
-        else:
-            return response.json(444)

Model/models.py

@@ -344,43 +344,42 @@ class Equipment_Info(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('-id',)
 
+
+
+class StatResModel(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='自动ID')
+    name = models.CharField(default='', max_length=120, verbose_name='图片路径地址')
+    addTime = models.IntegerField(verbose_name='添加时间', default=0)
+
+    def __str__(self):
+        return self.id
+
+    class Meta:
+        db_table = 'statres'
+        verbose_name = '静态资源表'
+        verbose_name_plural = verbose_name
+        ordering = ('id',)
+
 #
-# 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.SmallIntegerField(default=0, verbose_name='状态:0未解决/解决')
-#     content = models.TextField(blank=True, null=True, verbose_name=u'反馈描述')
-#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
-#     updTime = models.IntegerField(verbose_name='更新时间', default=0)
-#     FS = models.ManyToManyField(to='StatResModel', blank=True, verbose_name=u'用户反馈关联资源',
-#                                 db_table='fb_res')
-#
-#     # files = models.CharField(blank=True, max_length=300, default='', verbose_name=u'存储多张图片的路径')
-#     # resm = models.ManyToOneRel()
-#
-#     def __str__(self):
-#         return self.id
-#
-#     class Meta:
-#         db_table = 'feedback_info'
-#         verbose_name = u'用户反馈信息表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('id',)
-#
-#
-# class StatResModel(models.Model):
-#     id = models.AutoField(primary_key=True, verbose_name='自动ID')
-#     name = models.CharField(default='', max_length=120, verbose_name='图片路径地址')
-#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
-#
-#     def __str__(self):
-#         return self.id
-#
-#     class Meta:
-#         db_table = 'statres'
-#         verbose_name = '静态资源表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('id',)
+class FeedBackModel(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.SmallIntegerField(default=0, verbose_name='状态:0未解决/解决')
+    content = models.TextField(blank=True, null=True, verbose_name=u'反馈描述')
+    addTime = models.IntegerField(verbose_name='添加时间', default=0)
+    updTime = models.IntegerField(verbose_name='更新时间', default=0)
+    FS = models.ManyToManyField(to='StatResModel', blank=True, verbose_name=u'用户反馈关联资源',
+                                db_table='fb_res')
+
+    def __str__(self):
+        return self.id
+
+    class Meta:
+        db_table = 'feedback_info'
+        verbose_name = u'用户反馈信息表'
+        verbose_name_plural = verbose_name
+        ordering = ('id',)
+
 
  
 class User_Brand(models.Model):