Merge remote-tracking branch 'remotes/origin/Bin' into dev

Controller/EquipmentManager.py

@@ -163,7 +163,7 @@ def delUserEquipmentInterface(request):
             dv_qs.delete()
             asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
             asy.start()
-            notify_alexa_delete(uid)
+
     except Exception as e:
         errorInfo = traceback.format_exc()
         print('删除数据库记录错误: %s' % errorInfo)
@@ -1041,14 +1041,3 @@ def update_device_shadow(request):
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
     else:
         return JsonResponse(status=200, data={'code': 403, 'msg': 'error etk'})
-
-
-def notify_alexa_delete(UID):
-    url = 'https://www.zositech.xyz/deviceStatus/delete'
-    data = {
-        'UID': UID
-    }
-    try:
-        requests.post(url=url, data=data, timeout=1)
-    except Exception as e:
-        print(repr(e))

Controller/EquipmentManagerV3.py

@@ -99,7 +99,8 @@ class EquipmentManagerV3(View):
                                                  NickName=NickName, View_Account=View_Account,
                                                  View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
                         userDevice.save()
-                        self.notify_alexa_add(UID, userID, NickName)
+                        asy = threading.Thread(target=ModelService.del_eq_info, args=(UID, userID, NickName))
+                        asy.start()
                         # redisObj = RedisObject(db=8)
                         # redisObj.del_data(key='uid_qs_' + userID)
                     except Exception as e:
@@ -385,14 +386,4 @@ class EquipmentManagerV3(View):
                 password = password[3:-3]
         return password
 
-    def notify_alexa_add(self, uid, userID, nickname):
-        url = 'https://www.zositech.xyz/deviceStatus/addOrupdate'
-        data = {
-            'UID': uid,
-            'userID': userID,
-            'uid_nick': nickname
-        }
-        try:
-            requests.post(url, data=data, timeout=1)
-        except Exception as e:
-            print(repr(e))
+

Service/ModelService.py

@@ -1,3 +1,5 @@
+import requests
+
 from Model.models import *
 from Service.CommonService import CommonService
 import json
@@ -138,6 +140,7 @@ class ModelService:
 
     @staticmethod
     def del_eq_info(userID, uid):
+        notify_alexa_delete(uid)
         ei_qs = Equipment_Info.objects.filter(userID_id=userID, devUid=uid)
         ei_qs.delete()
         # ei_count = ei_qs.count()
@@ -151,3 +154,27 @@ class ModelService:
     def get_uid_list(userID):
         uid_list = Device_Info.objects.filter(userID_id=userID).values_list('UID', flat=True)
         return list(uid_list)
+
+    @staticmethod
+    def notify_alexa_add(uid, userID, nickname):
+        url = 'https://www.zositech.xyz/deviceStatus/addOrupdate'
+        data = {
+            'UID': uid,
+            'userID': userID,
+            'uid_nick': nickname
+        }
+        try:
+            requests.post(url, data=data, timeout=5)
+        except Exception as e:
+            print(repr(e))
+
+
+def notify_alexa_delete(UID):
+    url = 'https://www.zositech.xyz/deviceStatus/delete'
+    data = {
+        'UID': UID
+    }
+    try:
+        requests.post(url=url, data=data, timeout=5)
+    except Exception as e:
+        print(repr(e))