Merge branch 'dev' of http://192.168.136.99:3000/servers/ASJServer into dev

Controller/CloudTransfer.py

@@ -101,8 +101,8 @@ class cloudTestView(View):
             vodPrimaryMaster = newUserName
 
             with transaction.atomic():
-                # 更新旧设备的userID,设备添加时间
-                old_deviceInfo_qs.update(userID=newUserID, data_joined=now_time)
+                # 更新旧设备的userID,设备添加时间,关闭推送消息提醒
+                old_deviceInfo_qs.update(userID=newUserID, data_joined=now_time, NotificationMode=0)
                 # 更新设备的主用户信息
                 Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
                 VodHlsModel.objects.filter(uid=uid).delete()

Controller/EquipmentInfo.py

@@ -295,8 +295,8 @@ def deleteExpireEquipmentInfo(request):
     import time
     nowTime = int(time.time())
     try:
-        for i in range(5):
-            ei = Equipment_Info.objects.filter(addTime__lte=str(nowTime - 3600 * 24 * 7))[0:10000]
+        for i in range(10):
+            ei = Equipment_Info.objects.filter(eventTime__lte=str(nowTime - 3600 * 24 * 7))[0:10000]
             id_list = list(ei.values_list("id", flat=True))
             Equipment_Info.objects.filter(id__in=id_list).delete()
         return response.json(0)

Controller/IotCoreController.py

@@ -341,14 +341,22 @@ class IotCoreView(View):
     def getIotInfo(self, request_dict, response):
         # 获取IoT数据
         serial_number = request_dict.get('serial_number', None)
-        if not serial_number:
+        uid = request_dict.get('uid', None)
+        if not uid and not serial_number:
             return response.json(444)
 
         try:
-            serial_number = serial_number[0:6]
-            iot_info_qs = iotdeviceInfoModel.objects.filter(serial_number=serial_number).values('endpoint', 'token_iot_number')
+            if serial_number:
+                serial_number = serial_number[0:6]
+                iot_info_qs = iotdeviceInfoModel.objects.filter(serial_number=serial_number).\
+                    values('endpoint', 'token_iot_number')
+            else:
+                iot_info_qs = iotdeviceInfoModel.objects.filter(uid=uid).\
+                    values('endpoint', 'token_iot_number')
+
             if not iot_info_qs.exists():
                 return response.json(173)
+
             endpoint = iot_info_qs[0]['endpoint']
             token_iot_number = iot_info_qs[0]['token_iot_number']
             res = {'endpoint': endpoint, 'token_iot_number': token_iot_number}