|
|
@@ -1,12 +1,12 @@
|
|
|
-import logging
|
|
|
+import json
|
|
|
import time
|
|
|
|
|
|
import requests
|
|
|
+from django.db.models import Q
|
|
|
|
|
|
from Ansjer.config import BASE_DIR
|
|
|
from Model.models import *
|
|
|
-import json
|
|
|
-from django.db.models import Q
|
|
|
+from Service.EquipmentInfoService import EquipmentInfoService
|
|
|
|
|
|
|
|
|
# 针对模型封装的复用性代码
|
|
|
@@ -149,7 +149,6 @@ class ModelService:
|
|
|
else:
|
|
|
return True
|
|
|
|
|
|
-
|
|
|
# 通过用户名获取userIDLIST
|
|
|
@staticmethod
|
|
|
def get_user_list_by_username(username):
|
|
|
@@ -162,6 +161,11 @@ class ModelService:
|
|
|
notify_alexa_delete(userID, uid)
|
|
|
ei_qs = Equipment_Info.objects.filter(userID_id=userID, devUid=uid)
|
|
|
ei_qs.delete()
|
|
|
+ for i in range(1, 8):
|
|
|
+ eq_list = EquipmentInfoService.get_equipment_info_model('', i)
|
|
|
+ eq_list = eq_list.filter(device_user_id=userID, device_uid=uid)
|
|
|
+ if eq_list.exists():
|
|
|
+ eq_list.delete()
|
|
|
# ei_count = ei_qs.count()
|
|
|
# while (ei_count > 1000):
|
|
|
# ei_qs[0:1000].delete()
|
|
|
@@ -174,7 +178,6 @@ class ModelService:
|
|
|
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, encrypt_pwd):
|
|
|
url = 'https://www.zositech.xyz/deviceStatus/addOrUpdate'
|
|
|
@@ -194,7 +197,7 @@ class ModelService:
|
|
|
file_path = '/'.join((BASE_DIR, 'static/delete_device.log'))
|
|
|
file = open(file_path, 'a+')
|
|
|
file.write(ip + "; username:" + userID + "; time:" + time.strftime(
|
|
|
- "%Y-%m-%d %H:%M:%S", time.localtime()) + "; " + operation)
|
|
|
+ "%Y-%m-%d %H:%M:%S", time.localtime()) + "; " + operation)
|
|
|
file.write('\n')
|
|
|
file.flush()
|
|
|
file.close()
|
