|
@@ -15,7 +15,7 @@ from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
|
|
from Object.ETkObject import ETkObject
|
|
from Object.ETkObject import ETkObject
|
|
import oss2
|
|
import oss2
|
|
from django.http import JsonResponse
|
|
from django.http import JsonResponse
|
|
-
|
|
|
|
|
|
+from Object.RedisObject import RedisObject
|
|
|
|
|
|
# 查询用户设备
|
|
# 查询用户设备
|
|
def queryUserEquipmentInterface(request):
|
|
def queryUserEquipmentInterface(request):
|
|
@@ -85,6 +85,8 @@ def addNewUserEquipmentInterface(request):
|
|
if dValid:
|
|
if dValid:
|
|
return response.json(174)
|
|
return response.json(174)
|
|
else:
|
|
else:
|
|
|
|
+ redisObj = RedisObject(db=8)
|
|
|
|
+ redisObj.del_data(key='uid_qs_' + userID)
|
|
UID = deviceData.get('UID', '')
|
|
UID = deviceData.get('UID', '')
|
|
re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
if re_uid.match(UID):
|
|
if re_uid.match(UID):
|
|
@@ -149,8 +151,12 @@ def delUserEquipmentInterface(request):
|
|
# 主用户删除设备全部删除
|
|
# 主用户删除设备全部删除
|
|
try:
|
|
try:
|
|
dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
|
|
dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
|
|
|
|
+ redisObj = RedisObject(db=8)
|
|
|
|
+ redisObj.del_data(key='uid_qs_' + userID)
|
|
if dv_qs.exists():
|
|
if dv_qs.exists():
|
|
uid = dv_qs[0].UID
|
|
uid = dv_qs[0].UID
|
|
|
|
+ print('删除')
|
|
|
|
+ UID_Preview.objects.filter(uid=uid).delete()
|
|
dv_qs.delete()
|
|
dv_qs.delete()
|
|
asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
|
|
asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
|
|
asy.start()
|
|
asy.start()
|
|
@@ -368,6 +374,8 @@ def addInterface(request):
|
|
NickName=NickName, View_Account=View_Account,
|
|
NickName=NickName, View_Account=View_Account,
|
|
View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
|
|
View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
|
|
userDevice.save()
|
|
userDevice.save()
|
|
|
|
+ redisObj = RedisObject(db=8)
|
|
|
|
+ redisObj.del_data(key='uid_qs_' + userID)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
return response.json(10, repr(e))
|
|
return response.json(10, repr(e))
|
|
else:
|
|
else:
|
|
@@ -481,6 +489,8 @@ def admin_addInterface(request):
|
|
else:
|
|
else:
|
|
UID = deviceData.get('UID', '')
|
|
UID = deviceData.get('UID', '')
|
|
re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
|
|
+ redisObj = RedisObject(db=8)
|
|
|
|
+ redisObj.del_data(key='uid_qs_' + userID)
|
|
if re_uid.match(UID):
|
|
if re_uid.match(UID):
|
|
userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
|
|
userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
|
|
**deviceData)
|
|
**deviceData)
|
|
@@ -535,6 +545,7 @@ def admin_modifyInterface(request):
|
|
return response.json(444, 'username')
|
|
return response.json(444, 'username')
|
|
id = request_dict.get('id', None)
|
|
id = request_dict.get('id', None)
|
|
print(deviceContent)
|
|
print(deviceContent)
|
|
|
|
+
|
|
if not deviceContent or not id:
|
|
if not deviceContent or not id:
|
|
return response.json(444, 'content,id')
|
|
return response.json(444, 'content,id')
|
|
tko = TokenObject(token)
|
|
tko = TokenObject(token)
|
|
@@ -552,6 +563,8 @@ def admin_modifyInterface(request):
|
|
|
|
|
|
deviceData = json.loads(deviceContent)
|
|
deviceData = json.loads(deviceContent)
|
|
print(deviceData['UID'])
|
|
print(deviceData['UID'])
|
|
|
|
+ redisObj = RedisObject(db=8)
|
|
|
|
+ redisObj.del_data(key='uid_qs_' + userID)
|
|
dValid = Device_Info.objects.filter(userID_id=userID, UID=deviceData['UID'])
|
|
dValid = Device_Info.objects.filter(userID_id=userID, UID=deviceData['UID'])
|
|
if dValid.exists():
|
|
if dValid.exists():
|
|
dValid_dict = CommonService.qs_to_dict(dValid)
|
|
dValid_dict = CommonService.qs_to_dict(dValid)
|