zhi

Ansjer/urls.py

@@ -2,10 +2,11 @@ from django.conf.urls import url
 from django.urls import path, re_path
 
 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, \
+    AccessLog, Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, AppColophon, \
+    EquipmentManager, LogManager, PermissionManager, OTAEquipment, shareUserPermission, \
     UserManger, CheckUserData, \
-    UserController, CloudVod, OrderContrller, VodBucket, DetectController,DeviceShare,UserBrandController,StsOssController,UIDPreview,SysMsg
+    UserController, CloudVod, OrderContrller, VodBucket, DetectController, DeviceShare, UserBrandController, \
+    StsOssController, UIDPreview, SysMsg
 
 urlpatterns = [
     url(r'^account/authcode$', UserController.authCodeView.as_view()),
@@ -73,7 +74,7 @@ urlpatterns = [
     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'^userbrandinfo/(?P<operation>.*)$', UserBrandController.UserBrandInfo.as_view()),  # 用户登录的手机端品牌记录统计信息表
 
     url(r'^appInfo', AppInfo.AppInfo.as_view()),  # app版本信息
     url(r'^accesslog', AccessLog.AccessLog.as_view()),
@@ -117,7 +118,7 @@ urlpatterns = [
     url(r'^cloudVod/(?P<operation>.*)$', CloudVod.CloudVodView.as_view()),
     url(r'^meal/(?P<operation>.*)$', MealManage.MealView.as_view()),
     url(r'^order/(?P<operation>.*)$', OrderContrller.OrderView.as_view()),
-    url(r'^uidApp/(?P<operation>.*)$', UidappController.UidappView.as_view()),
+    # url(r'^uidApp/(?P<operation>.*)$', UidappController.UidappView.as_view()),
     url(r'^appCol/(?P<operation>.*)$', AppColophon.AppColView.as_view()),
     url(r'^vodBucket/(?P<operation>.*)$', VodBucket.VodBucketView.as_view()),
     url(r'^UIDBucket/(?P<operation>.*)$', VodBucket.UidBucketView.as_view()),
@@ -130,7 +131,7 @@ urlpatterns = [
     url(r'^getTZ$', EquipmentStatus.getTZ),
 
     # oss授权
-    url(r'^stsOss/(?P<operation>.*)$',StsOssController.StsOssView.as_view()),
+    url(r'^stsOss/(?P<operation>.*)$', StsOssController.StsOssView.as_view()),
 
     # 用户反馈信息
     url(r'^feedback/(?P<operation>.*)$', FeedBack.FeedBackView.as_view()),

Controller/DetectController.py

@@ -26,7 +26,7 @@ from django.views.generic.base import View
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Ansjer.config import BASE_DIR
 from Ansjer.config import SERVER_DOMAIN
-from Model.models import Device_Info, VodHlsModel, UID_App, Equipment_Info, UidSetModel, UidPushModel
+from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel, UidPushModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
@@ -130,72 +130,6 @@ class DetectControllerView(View):
             res.append(p)
         return response.json(0, {'datas': res, 'count': count})
 
-    def do_change_status11(self, userID, request_dict, response):
-        uid = request_dict.get('uid', None)
-        token_val = request_dict.get('token_val', None)
-        appBundleId = request_dict.get('appBundleId', None)
-        app_type = request_dict.get('app_type', None)
-        push_type = request_dict.get('push_type', None)
-        status = request_dict.get('status', None)
-        m_code = request_dict.get('m_code', None)
-        # interval = request_dict.get('interval', None)
-        print('status:' + status)
-        if not status:
-            return response.json(444, 'status')
-        # 关闭推送
-        if status == '0':
-            if not all([app_type, appBundleId, uid, m_code]):
-                return response.json(444, 'app_type,appBundleId,uid,m_code')
-            uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, m_code=m_code, uid=uid,
-                                                app_type=app_type)
-            if uid_app_qs.exists():
-                uid_app_qs.update(status=0)
-                return response.json(0)
-            else:
-                return response.json(173)
-        # 开启推
-        elif status == '1':
-            if not all([appBundleId, app_type, token_val, uid, m_code]):
-                return response.json(444, 'appBundleId,app_type,token_val,uid,m_code')
-            dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
-
-            if dvqs.exists():
-                now_time = int(time.time())
-                try:
-                    uid_app_qs = UID_App.objects.filter(appBundleId=appBundleId, userID_id=userID, token_val=token_val,
-                                                        uid=uid, m_code=m_code)
-                    print(uid_app_qs)
-                    if uid_app_qs.exists():
-                        update_dict = {'status': 1}
-                        # if interval:
-                        #     update_dict['interval'] = int(interval)
-                        uid_app_qs.update(**update_dict)
-                    else:
-                        create_dict = {
-                            'uid': uid,
-                            'userID_id': userID,
-                            'appBundleId': appBundleId,
-                            'app_type': app_type,
-                            'push_type': push_type,
-                            'token_val': token_val,
-                            'status': 1,
-                            'm_code': m_code,
-                            'addTime': now_time,
-                            'updTime': now_time}
-                        # if interval:
-                        #     create_dict['interval'] = int(interval)
-                        UID_App.objects.create(**create_dict)
-                except Exception as e:
-                    print(repr(e))
-                    return response.json(10, repr(e))
-                else:
-                    utko = UidTokenObject()
-                    utko.generate(data={'uid': uid})
-                    detectUrl = "{SERVER_DOMAIN}notify/push?uidToken={uidToken}". \
-                        format(uidToken=utko.token, SERVER_DOMAIN=SERVER_DOMAIN)
-                    return response.json(0, {'detectUrl': detectUrl})
-            else:
-                return response.json(173)
 
     def do_change_status(self, userID, request_dict, response):
         uid = request_dict.get('uid', None)

Controller/EquipmentManager.py

@@ -4,7 +4,7 @@ import traceback
 
 import simplejson as json
 from django.utils import timezone
-from Model.models import Device_User, Device_Info, UID_Bucket, UID_App, UID_Preview, UidSetModel
+from Model.models import Device_User, Device_Info, UID_Bucket, UID_Preview, UidSetModel
 from django.db.models import Q
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject

Controller/UidappController.py

@@ -1,157 +0,0 @@
-import time
-import traceback
-
-import simplejson as json
-from django.utils.decorators import method_decorator
-from django.views.decorators.csrf import csrf_exempt
-from django.views.generic.base import View
-
-from Model.models import UID_App
-from Object.ResponseObject import ResponseObject
-from Object.TokenObject import TokenObject
-from Service.CommonService import CommonService
-from Service.ModelService import ModelService
-
-'''
-# 管理员获取信息
-http://192.168.136.39:8000/uidApp/adminQuery?token=local&page=1&line=10
-  管理员删除信息
-http://192.168.136.39:8000/uidApp/adminDelete?token=local&id=2
-  管理员添加信息
-http://192.168.136.39:8000/uidApp/adminAdd?token=local&uid=JW3684H8BSHG9TTM111A&appBundleId=com.ansjer.accloud&app_type=2&token_val=ertewtwetrewrt
-  管理员编辑信息
-http://192.168.136.39:8000/uidApp/adminEdit?token=local&id=6&content={"token_val":"9999"}
-'''
-
-
-# 设备信息添加
-class UidappView(View):
-    @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(UidappView, self).dispatch(*args, **kwargs)
-
-    def get(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation')
-        return self.validation(request.GET, request, operation)
-
-    def post(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        operation = kwargs.get('operation')
-        return self.validation(request.POST, request, operation)
-
-    def validation(self, request_dict, request, operation):
-        response = ResponseObject()
-        if operation is None:
-            return response.json(444, 'error path')
-        token = request_dict.get('token', None)
-        # 设备主键uid
-        tko = TokenObject(token)
-        response.lang = tko.lang
-        if tko.code != 0:
-            return response.json(tko.code)
-        userID = tko.userID
-        if operation == 'adminDelete':
-            return self.do_admin_delete(request_dict, userID, response)
-        elif operation == 'adminQuery':
-            return self.do_admin_query(request_dict, userID, response)
-        elif operation == 'adminAdd':
-            return self.do_admin_add(request_dict, userID, response)
-        elif operation == 'adminEdit':
-            return self.do_admin_edit(request_dict, userID, response)
-        else:
-            return response.json(444, 'error path')
-
-    # 管理员删除
-    def do_admin_delete(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID, 20)
-        if own_perm is True:
-            id = request_dict.get('id')
-            try:
-                list = UID_App.objects.filter(id=id)
-                if list.exists():
-                    list.delete()
-                    return response.json(0)
-                else:
-                    return response.json(173)
-            except Exception as e:
-                print(repr(e))
-                return response.json(424, repr(e))
-        else:
-            return response.json(404)
-
-    # 管理员查询接口
-    def do_admin_query(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID, 20)
-        if own_perm is True:
-            page = request_dict.get('page', None)
-            line = request_dict.get('line', None)
-            page = int(page)
-            line = int(line)
-            omqs = UID_App.objects.filter()
-            if not omqs.exists():
-                return response.json(0, [])
-            count = omqs.count()
-            order_ql = omqs[(page - 1) * line:page * line].values("id", "uid", "app_type","appBundleId","push_type", "token_val", "addTime", "updTime","status", "userID__username")
-
-            order_list = list(order_ql)
-            print (order_list)
-            return response.json(0, {'data': order_list, 'count': count})
-
-        else:
-            return response.json(404)
-
-    # 管理员的添加
-    def do_admin_add(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID=userID, permID=40)
-        if own_perm is not True:
-            return response.json(404)
-        uid = request_dict.get('uid', None)
-        appBundleId = request_dict.get('appBundleId', None)
-        app_type = request_dict.get('app_type', None)
-        token_val = request_dict.get('token_val', None)
-        timestamp = int(time.time())
-        param_flag = CommonService.get_param_flag(
-            data=[uid, appBundleId, app_type, token_val])
-        if param_flag is not True:
-            return response.json(444)
-        try:
-            Uidapp = UID_App(
-                uid=uid,
-                appBundleId=appBundleId,
-                app_type=app_type,
-                token_val=token_val,
-                addTime=timestamp,
-                updTime=timestamp)
-            Uidapp.save()
-            return response.json(0)
-        except Exception:
-            errorInfo = traceback.format_exc()
-            print(errorInfo)
-            return response.json(500, {'details': errorInfo})
-
-    # 管理员的编辑
-    def do_admin_edit(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID=userID, permID=50)
-        if own_perm is not True:
-            return response.json(404)
-        deviceContent = request_dict.get('content', None)
-        id = request_dict.get('id', None)
-        if not deviceContent or not id:
-            return response.json(444, 'content,id')
-        try:
-            timestamp = int(time.time())
-            deviceData = json.loads(deviceContent)
-            uid_app = UID_App.objects.filter(id=id)
-            if uid_app.exists():
-                uid_app.update(updTime=timestamp, **deviceData)
-                return response.json(0)
-            else:
-                return response.json(173)
-        except Exception:
-            errorInfo = traceback.format_exc()
-            print(errorInfo)
-            return response.json(500, {'details': errorInfo})
-
-
-

Controller/UserController.py

@@ -26,7 +26,7 @@ from ratelimit.decorators import ratelimit
 
 from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
-from Model.models import Device_User, Role, UID_App, SysMsgModel
+from Model.models import Device_User, Role,  SysMsgModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -302,10 +302,11 @@ class LogoutView(TemplateView):
             m_code = request_dict.get('m_code', None)
             if m_code:
                 userID = tko.userID
-                uid_app = UID_App.objects.filter(userID_id=userID, m_code=m_code, status=1)
-                print(uid_app)
-                if uid_app.exists():
-                    uid_app.update(status=2)
+                #
+                # uid_app = UID_App.objects.filter(userID_id=userID, m_code=m_code, status=1)
+                # print(uid_app)
+                # if uid_app.exists():
+                #     uid_app.update(status=2)
             return response.json(0)
         else:
             return response.json(tko.code)
@@ -1129,12 +1130,12 @@ class InitInfoView(View):
         tko = TokenObject(token)
         if tko.code == 0:
             userID = tko.userID
-            return self.init_uid_app(request_dict, userID, response)
+            return self.init_uid(request_dict, userID, response)
         else:
             return response.json(tko.code)
 
     # 初始化设备token
-    def init_uid_app(self, request_dict, userID, response):
+    def init_uid(self, request_dict, userID, response):
         token_val = request_dict.get('token_val', None)
         m_code = request_dict.get('m_code', None)
         # uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=2, m_code=m_code)

Model/models.py

@@ -614,25 +614,25 @@ class UID_Bucket(models.Model):
 
 
 # 推送uid绑定 app —— token_id
-class UID_App(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
-    uid = models.CharField(max_length=20, verbose_name='设备UID')
-    appBundleId = models.CharField(blank=True, max_length=32, verbose_name=u'appID')
-    app_type = models.IntegerField(default=0, verbose_name=u'app类型 1:ios,2:安卓')
-    push_type = models.IntegerField(default=0, verbose_name=u'推送类型')  # 0,apns 1,安卓gcm 2,极光
-    token_val = models.CharField(default='', max_length=160, verbose_name=u'设备验证令牌')
-    status = models.SmallIntegerField(default=0, verbose_name='状态[0:关闭,1:开启,2:用户解绑]')
-    m_code = models.CharField(default='', max_length=64, verbose_name='手机唯一标识')
-    interval = models.IntegerField(verbose_name='推送间隔', default=0)  # 秒
-    addTime = models.IntegerField(verbose_name='添加时间', default=0)
-    updTime = models.IntegerField(verbose_name='更新时间', default=0)
-
-    class Meta:
-        db_table = 'uid_app'
-        verbose_name = u'设备关联APP表'
-        verbose_name_plural = verbose_name
-        ordering = ('id',)
+# class UID_App(models.Model):
+#     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
+#     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
+#     uid = models.CharField(max_length=20, verbose_name='设备UID')
+#     appBundleId = models.CharField(blank=True, max_length=32, verbose_name=u'appID')
+#     app_type = models.IntegerField(default=0, verbose_name=u'app类型 1:ios,2:安卓')
+#     push_type = models.IntegerField(default=0, verbose_name=u'推送类型')  # 0,apns 1,安卓gcm 2,极光
+#     token_val = models.CharField(default='', max_length=160, verbose_name=u'设备验证令牌')
+#     status = models.SmallIntegerField(default=0, verbose_name='状态[0:关闭,1:开启,2:用户解绑]')
+#     m_code = models.CharField(default='', max_length=64, verbose_name='手机唯一标识')
+#     interval = models.IntegerField(verbose_name='推送间隔', default=0)  # 秒
+#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
+#     updTime = models.IntegerField(verbose_name='更新时间', default=0)
+#
+#     class Meta:
+#         db_table = 'uid_app'
+#         verbose_name = u'设备关联APP表'
+#         verbose_name_plural = verbose_name
+#         ordering = ('id',)
 
 
 class UID_Preview(models.Model):