|
|
@@ -226,7 +226,7 @@ class deviceStatus(TemplateView):
|
|
|
data_list = request_dict.get("data_list", '')
|
|
|
logger.info('data_list: {}'.format(data_list))
|
|
|
data_list = json.loads(data_list) # 多通道设备才传 channel 键值对
|
|
|
- skill_name = 'zosi smart'
|
|
|
+
|
|
|
if not data_list:
|
|
|
return JsonResponse({'code': 101, 'msg': 'Parameter error'})
|
|
|
|
|
|
@@ -237,12 +237,13 @@ class deviceStatus(TemplateView):
|
|
|
password = CommonService().decode_pwd(password)
|
|
|
|
|
|
# 获取alexa授权信息
|
|
|
- alexAuth = AlexaAuthModel.objects.filter(userID=userID, skill_name=skill_name). \
|
|
|
- values('expiresTime', 'access_token', 'refresh_token', 'alexa_region')
|
|
|
+ alexAuth = AlexaAuthModel.objects.filter(userID=userID). \
|
|
|
+ values('expiresTime', 'access_token', 'refresh_token', 'alexa_region', 'skill_name')
|
|
|
if not alexAuth.exists():
|
|
|
logger.info('UID为 {} 的用户不存在'.format(UID))
|
|
|
return JsonResponse({'code': 102, 'msg': 'not found user'})
|
|
|
|
|
|
+ skill_name = alexAuth[0]['skill_name']
|
|
|
expiresTime = alexAuth[0]['expiresTime']
|
|
|
access_token = alexAuth[0]['access_token']
|
|
|
refresh_token = alexAuth[0]['refresh_token']
|
|
|
@@ -615,7 +616,7 @@ class deviceStatus(TemplateView):
|
|
|
def deleteSwitch(self, request_dict):
|
|
|
serial_number = request_dict.get("serial_number", '')
|
|
|
logger = logging.getLogger('django')
|
|
|
- logger.info('--------删除设备--------')
|
|
|
+ logger.info('--------删除插座--------')
|
|
|
logger.info('serial_number: {}'.format(serial_number))
|
|
|
if not all([serial_number]):
|
|
|
return JsonResponse({'code': 111, 'msg': '参数异常'})
|
peng