|
@@ -68,8 +68,10 @@ class DeviceManagement(View):
|
|
|
return response.json(444, 'userID')
|
|
|
if operation == 'getDeviceInfoList': # 获取设备信息数据
|
|
|
return self.get_device_info_list(request_dict, response)
|
|
|
- elif operation == 'deleteDevice':
|
|
|
- return self.deleteDevice(request_dict, response)
|
|
|
+ elif operation == 'deleteDevice': # 删除设备
|
|
|
+ return self.deleteDevice(request, request_dict, response, userID)
|
|
|
+ elif operation == 'delDeviceDataV2': # 后台设备删除数据
|
|
|
+ return self.del_device_data(request, request_dict, response, userID)
|
|
|
elif operation == 'resetVod': # 重置云存
|
|
|
return self.resetVod(request, request_dict, response)
|
|
|
elif operation == 'resetAi': # 重置AI
|
|
@@ -233,7 +235,7 @@ class DeviceManagement(View):
|
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
# 根据id删除设备
|
|
|
- def deleteDevice(self, request_dict, response):
|
|
|
+ def deleteDevice(self, request, request_dict, response, user_id):
|
|
|
deviceID = request_dict.get('deviceID', None)
|
|
|
userID = request_dict.get('userID', None)
|
|
|
uid = request_dict.get('uid', None)
|
|
@@ -246,6 +248,18 @@ class DeviceManagement(View):
|
|
|
UidPushModel.objects.filter(uid_set__uid=uid).delete()
|
|
|
# 删除推送消息
|
|
|
EquipmentInfoService.delete_all_equipment_info(device_user_id=userID, device_uid=uid)
|
|
|
+ content = json.loads(json.dumps(request_dict))
|
|
|
+ ip = CommonService.get_ip_address(request)
|
|
|
+ log = {
|
|
|
+ 'user_id': 2,
|
|
|
+ 'status': 200,
|
|
|
+ 'time': int(time.time()),
|
|
|
+ 'url': 'deviceManagement/deleteDevice',
|
|
|
+ 'content': user_id,
|
|
|
+ 'ip': ip,
|
|
|
+ 'operation': '删除设备和配置记录:{}'.format(json.dumps(content)),
|
|
|
+ }
|
|
|
+ LogModel.objects.create(**log)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
print(e)
|
|
@@ -415,7 +429,7 @@ class DeviceManagement(View):
|
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
@staticmethod
|
|
|
- def del_device_data(request, request_dict, response):
|
|
|
+ def del_device_data(request, request_dict, response, user_id=''):
|
|
|
uidList = request_dict.get('uidList', None)
|
|
|
delDataOptions = request_dict.get('delDataOptions', None)
|
|
|
serialNumberList = request_dict.get('serialNumberList', None)
|
|
@@ -431,7 +445,7 @@ class DeviceManagement(View):
|
|
|
'url': 'deviceManagement/delDeviceData',
|
|
|
'content': delDataOptions,
|
|
|
'ip': ip,
|
|
|
- 'operation': '上传文件设备重置删除前:{}'.format(json.dumps(content)),
|
|
|
+ 'operation': '上传文件设备重置删除前:user:{},{}'.format(user_id, json.dumps(content)),
|
|
|
}
|
|
|
LogModel.objects.create(**log)
|
|
|
try:
|