uid delete

Ansjer/urls.py

@@ -131,7 +131,6 @@ urlpatterns = [
     url(r'^appVer/views$', AppInfo.AppVersionView.as_view()),
 
     # 屏蔽
-    url(r'^user/init$', UserController.InitInfoView.as_view()),
     url(r'^user/initInfo$', UserController.InitInfoView.as_view()),
     # 获取时区相关信息
     url(r'^getTZ$', EquipmentStatus.getTZ),

Controller/DetectController.py

@@ -29,22 +29,28 @@ from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
 from django.http import JsonResponse
 from Object.RedisObject import RedisObject
+from Service.CommonService import CommonService
 
 
-# http://192.168.136.40:8077/detect/changeStatus?uid=JW3684H8BSHG9TTM111A&token_val=18071adc03536302f34&appBundleId=com.ansjer.zccloud_ab&push_type=2&token=local&status=1&app_type=1
+# http://192.168.136.40:8077/detect/changeStatus?uid=JW3684H8BSHG9TTM111A&token_val=18071adc03536302f34&appBundleId=com.ansjer.zccloud_ab&push_type=2&token=local&status=1&app_type=1&m_code=12
 class DetectControllerView(View):
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):
         return super(DetectControllerView, self).dispatch(*args, **kwargs)
 
+    def __init__(self):
+        self.ip = ''
+
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
+        self.ip = CommonService.get_ip_address(request)
         return self.validation(request.GET, operation)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
+        self.ip = CommonService.get_ip_address(request)
         return self.validation(request.POST, operation)
 
     def validation(self, request_dict, operation):
@@ -150,6 +156,14 @@ class DetectControllerView(View):
         dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
         status = int(status)
         if dvqs.exists():
+            # 获取用户区域
+            ip = self.ip
+            ipInfo = CommonService.getIpIpInfo(ip=ip, lang='EN')
+            area = ipInfo['country_name']
+            # if area == 'China':
+            #     DETECT_PUSH_DOMAIN = 'cn.push.dvema.com'
+            # else:
+            #     DETECT_PUSH_DOMAIN = 'en.push.dvema.com'
             nowTime = int(time.time())
             uid_set_qs = UidSetModel.objects. \
                 filter(uid=uid, uidpushmodel__userID_id=userID, uidpushmodel__m_code=m_code)

Controller/EquipmentInfo.py

@@ -457,13 +457,15 @@ select concat(round(sum(data_length/1024/1024),2),'MB') as data from tables wher
 # 按季度删除访问日志
 def deleteExpireEquipmentInfo(request):
     response = ResponseObject()
-    i = int(request.GET.get('i', 10))
+    i = int(request.GET.get('i', 5))
 
     import time
     nowTime = int(time.time())
-    for i in range(5):
-        ei = Equipment_Info.objects.filter(addTime__lte=str(nowTime - 3600 * 24 * 30))[0:10000]
+    for i in range(i):
+        ei = Equipment_Info.objects.filter(addTime__lte=str(nowTime - 3600 * 24 * 7))[0:10000]
         id_list = ei.values_list("id", flat=True)
         print(id_list)
         Equipment_Info.objects.filter(id__in=list(id_list)).delete()
     return response.json(0)
+
+

Controller/EquipmentManager.py

@@ -571,7 +571,7 @@ def deleteInterface(request):
                 # 删除设备影子信息uid_set   外键关联删除设备推送配置信息 uid_push
                 up_qs = UidPushModel.objects.filter(uid=uid)
                 if up_qs.count > 1:
-                    UidPushModel.objects.filter(uid=uid, userID_id=userID).delete()
+                    UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
                 else:
                     UidSetModel.objects.filter(uid=uid).delete()
                 # b.分享获得用户假删除