|
@@ -74,7 +74,6 @@ class EquipmentManagerV3(View):
|
|
|
View_Password = request_dict.get('View_Password', '')
|
|
View_Password = request_dict.get('View_Password', '')
|
|
|
encrypt_pass = View_Password
|
|
encrypt_pass = View_Password
|
|
|
print("准备解密")
|
|
print("准备解密")
|
|
|
- View_Password = self.decode_pwd(View_Password)
|
|
|
|
|
Type = request_dict.get('Type', None)
|
|
Type = request_dict.get('Type', None)
|
|
|
ChannelIndex = request_dict.get('ChannelIndex', None)
|
|
ChannelIndex = request_dict.get('ChannelIndex', None)
|
|
|
version = request_dict.get('version', '')
|
|
version = request_dict.get('version', '')
|
|
@@ -99,10 +98,7 @@ class EquipmentManagerV3(View):
|
|
|
device_info_qs.delete()
|
|
device_info_qs.delete()
|
|
|
|
|
|
|
|
dvr_type_list = [1, 2, 3, 4, 10001]
|
|
dvr_type_list = [1, 2, 3, 4, 10001]
|
|
|
- if Type in dvr_type_list:
|
|
|
|
|
- View_Password = ""
|
|
|
|
|
- else:
|
|
|
|
|
- View_Password = 'admin'
|
|
|
|
|
|
|
+ View_Password = '' if Type in dvr_type_list else 'admin'
|
|
|
|
|
|
|
|
id = CommonService.getUserID(getUser=False)
|
|
id = CommonService.getUserID(getUser=False)
|
|
|
userName = Device_User.objects.get(userID=userID).username
|
|
userName = Device_User.objects.get(userID=userID).username
|
|
@@ -262,6 +258,8 @@ class EquipmentManagerV3(View):
|
|
|
'endpoint': iotqs[0].endpoint,
|
|
'endpoint': iotqs[0].endpoint,
|
|
|
'token_iot_number': iotqs[0].endpoint
|
|
'token_iot_number': iotqs[0].endpoint
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ res['serial_number'] = ''
|
|
|
return response.json(0, res)
|
|
return response.json(0, res)
|
|
|
|
|
|
|
|
def do_batch_add(self, userID, request_dict, response, request):
|
|
def do_batch_add(self, userID, request_dict, response, request):
|
