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

Ansjer/urls.py

@@ -73,7 +73,6 @@ 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'^userbrandinfo/(?P<operation>.*)$', UserBrandController.UserBrandInfo.as_view()),  # 用户登录的手机端品牌记录统计信息表
 
     url(r'^uidset/(?P<operation>.*)$', UidSetController.UidSetView.as_view()),

Controller/FeedBack.py

@@ -12,18 +12,19 @@
 @Contact: chanjunkai@163.com
 """
 
-import time
 import json
+import time
+
 import oss2
+from django.db import transaction
 from django.views.generic.base import View
-from var_dump import var_dump
+
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import FeedBackModel, StatResModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-from django.db import transaction
 
 
 class FeedBackView(View):

Controller/shareUserPermission.py

@@ -40,6 +40,9 @@ class searchUserView(View):
         elif 'userID' in fieldDict.keys():
             userID = fieldDict.get('userID', None)
             User = Device_User.objects.filter(userID=userID).order_by('-data_joined')
+        elif 'roleName' in fieldDict.keys():
+            roleName = fieldDict.get('roleName', None)
+            User = Device_User.objects.filter(role__roleName__contains=roleName).order_by('-data_joined')
         else:
             User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
         if User.exists():
@@ -242,13 +245,13 @@ class shareUserEquipmentView(View):
                 return response.json(500, {"details": repr(e)})
             else:
                 if dictLen > 0:
-                    res = {'Shared': dictLen,'Sharing': len(querysetList),'errormsg': 'some had share'}
+                    res = {'Shared': dictLen, 'Sharing': len(querysetList), 'errormsg': 'some had share'}
                 else:
                     if sharedAll:
                         res = {'Sharing': len(querysetList)}
                     else:
                         if len(UID) > 0:
-                            res = {'error_UID': UID,'Sharing': len(querysetList)}
+                            res = {'error_UID': UID, 'Sharing': len(querysetList)}
                         else:
                             res = {'Sharing': len(querysetList)}
                 return response.json(0, res)
@@ -297,7 +300,7 @@ class unsharedUserEquipmentView(View):
                     if content != None and MasterID != None:
                         return self.unsharedUserEquipmentSQL(MasterID, GuestID, False, response, args, content=content)
                     else:
-                        return response.json(444,'content or unsharedAll')
+                        return response.json(444, 'content or unsharedAll')
             else:
                 return response.json(tko.code)
         else:
@@ -339,4 +342,3 @@ class unsharedUserEquipmentView(View):
                         return response.json(173, {'removeCount': removeCount, 'error_UID': errorUID})
                     else:
                         return response.json(0, {'removeCount': removeCount})
-

Model/models.py

@@ -638,7 +638,7 @@ class UID_Preview(models.Model):
 # 系统发送信息新到用户
 class SysMsgModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
-    userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
+    userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE) # 用户信息
     msg = models.TextField(blank=True, default='', verbose_name=u'更新内容')
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)