|
@@ -96,8 +96,8 @@ class EquipmentManagerV3(View):
|
|
|
NickName=NickName, View_Account=View_Account,
|
|
|
View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
|
|
|
userDevice.save()
|
|
|
- redisObj = RedisObject(db=8)
|
|
|
- redisObj.del_data(key='uid_qs_' + userID)
|
|
|
+ # redisObj = RedisObject(db=8)
|
|
|
+ # redisObj.del_data(key='uid_qs_' + userID)
|
|
|
except Exception as e:
|
|
|
return response.json(10, repr(e))
|
|
|
else:
|
|
@@ -163,14 +163,15 @@ class EquipmentManagerV3(View):
|
|
|
'uid': uid,
|
|
|
'addTime': nowTime,
|
|
|
'updTime': nowTime,
|
|
|
- 'ip': CommonService.get_ip_address(request),
|
|
|
+ # 'ip': CommonService.get_ip_address(request),
|
|
|
'channel': ChannelIndex,
|
|
|
'nickname': nickname,
|
|
|
}
|
|
|
UidSetModel.objects.create(**uid_set_create_dict)
|
|
|
- Device_Info.objects.filter(UID=uid).update(NickName=nickname)
|
|
|
- redisObj = RedisObject(db=8)
|
|
|
- redisObj.del_data(key='uid_qs_' + userID)
|
|
|
+ di_qs = Device_Info.objects.filter(UID=uid)
|
|
|
+ di_qs.update(NickName=nickname)
|
|
|
+ # redisObj = RedisObject(db=8)
|
|
|
+ # redisObj.del_data(key='uid_qs_' + userID)
|
|
|
return response.json(0, res)
|
|
|
|
|
|
# 新查询设备字段
|
|
@@ -187,149 +188,122 @@ class EquipmentManagerV3(View):
|
|
|
if page <= 0:
|
|
|
return response.json(0)
|
|
|
if tko.code == 0:
|
|
|
- redisObj = RedisObject(db=8)
|
|
|
- redis_value = redisObj.get_data(key='uid_qs_'+userID)
|
|
|
- result = []
|
|
|
- if redis_value == False:
|
|
|
- # print('缓存不存在就开始添加到缓存')
|
|
|
- userID = tko.userID
|
|
|
- dvqs = Device_Info.objects.filter(userID_id=userID)
|
|
|
- # # 过滤已重置的设备
|
|
|
- dvqs = dvqs.filter(~Q(isExist=2))
|
|
|
- dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
|
|
|
- 'View_Password', 'ChannelIndex', 'Type', 'isShare',
|
|
|
- 'primaryUserID', 'primaryMaster', 'data_joined',
|
|
|
- 'version', 'isVod', 'isExist', 'NotificationMode')
|
|
|
- dvls = CommonService.qs_to_list(dvql)
|
|
|
- uid_list = []
|
|
|
- for dvl in dvls:
|
|
|
- uid_list.append(dvl['UID'])
|
|
|
- ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
- values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
- upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
|
|
|
- auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
- bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
- nowTime = int(time.time())
|
|
|
- data = []
|
|
|
- # 设备拓展信息表
|
|
|
- us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('id', 'uid', 'version', 'nickname', 'ucode',
|
|
|
- 'detect_status', 'detect_group', 'detect_interval',
|
|
|
- 'region_alexa', 'is_alexa', 'deviceModel',
|
|
|
- 'TimeZone', 'TimeStatus', 'SpaceUsable',
|
|
|
- 'SpaceSum', 'MirrorType', 'RecordType',
|
|
|
- 'OutdoorModel', 'WIFIName', 'isDetector', 'DetectorRank')
|
|
|
- uv_dict = {}
|
|
|
- for us in us_qs:
|
|
|
- uv_dict[us['uid']] = {
|
|
|
- 'version': us['version'],
|
|
|
- 'nickname': us['nickname'],
|
|
|
- 'ucode': us['ucode'],
|
|
|
- 'detect_interval': us['detect_interval'],
|
|
|
- 'detect_group': us['detect_group'],
|
|
|
- 'detect_status': us['detect_status'],
|
|
|
- 'region_alexa': us['region_alexa'],
|
|
|
- 'is_alexa': us['is_alexa'],
|
|
|
- 'deviceModel': us['deviceModel'],
|
|
|
- 'TimeZone': us['TimeZone'],
|
|
|
- 'TimeStatus': us['TimeStatus'],
|
|
|
- 'SpaceUsable': us['SpaceUsable'],
|
|
|
- 'SpaceSum': us['SpaceSum'],
|
|
|
- 'MirrorType': us['MirrorType'],
|
|
|
- 'RecordType': us['RecordType'],
|
|
|
- 'OutdoorModel': us['OutdoorModel'],
|
|
|
- 'WIFIName': us['WIFIName'],
|
|
|
- 'isDetector': us['isDetector'],
|
|
|
- 'DetectorRank': us['DetectorRank']
|
|
|
+ userID = tko.userID
|
|
|
+ dvqs = Device_Info.objects.filter(userID_id=userID)
|
|
|
+ # # 过滤已重置的设备
|
|
|
+ dvqs = dvqs.filter(~Q(isExist=2))
|
|
|
+ dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
|
|
|
+ 'View_Password', 'ChannelIndex', 'Type', 'isShare',
|
|
|
+ 'primaryUserID', 'primaryMaster', 'data_joined',
|
|
|
+ 'version', 'isVod', 'isExist', 'NotificationMode')
|
|
|
+ dvls = CommonService.qs_to_list(dvql)
|
|
|
+ uid_list = []
|
|
|
+ for dvl in dvls:
|
|
|
+ uid_list.append(dvl['UID'])
|
|
|
+ ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
+ values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
+ upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
|
|
|
+ auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
+ bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
+ nowTime = int(time.time())
|
|
|
+ data = []
|
|
|
+ # 设备拓展信息表
|
|
|
+ us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('id', 'uid', 'version', 'nickname', 'ucode',
|
|
|
+ 'detect_status', 'detect_group',
|
|
|
+ 'detect_interval',
|
|
|
+ 'region_alexa', 'is_alexa', 'deviceModel',
|
|
|
+ 'TimeZone', 'TimeStatus', 'SpaceUsable',
|
|
|
+ 'SpaceSum', 'MirrorType', 'RecordType',
|
|
|
+ 'OutdoorModel', 'WIFIName', 'isDetector',
|
|
|
+ 'DetectorRank')
|
|
|
+ uv_dict = {}
|
|
|
+ for us in us_qs:
|
|
|
+ uv_dict[us['uid']] = {
|
|
|
+ 'version': us['version'],
|
|
|
+ 'nickname': us['nickname'],
|
|
|
+ 'ucode': us['ucode'],
|
|
|
+ 'detect_interval': us['detect_interval'],
|
|
|
+ 'detect_group': us['detect_group'],
|
|
|
+ 'detect_status': us['detect_status'],
|
|
|
+ 'region_alexa': us['region_alexa'],
|
|
|
+ 'is_alexa': us['is_alexa'],
|
|
|
+ 'deviceModel': us['deviceModel'],
|
|
|
+ 'TimeZone': us['TimeZone'],
|
|
|
+ 'TimeStatus': us['TimeStatus'],
|
|
|
+ 'SpaceUsable': us['SpaceUsable'],
|
|
|
+ 'SpaceSum': us['SpaceSum'],
|
|
|
+ 'MirrorType': us['MirrorType'],
|
|
|
+ 'RecordType': us['RecordType'],
|
|
|
+ 'OutdoorModel': us['OutdoorModel'],
|
|
|
+ 'WIFIName': us['WIFIName'],
|
|
|
+ 'isDetector': us['isDetector'],
|
|
|
+ 'DetectorRank': us['DetectorRank']
|
|
|
+ }
|
|
|
+ # 从uid_channel里面取出通道配置信息
|
|
|
+ ucs_qs = UidChannelSetModel.objects.filter(uid__id=us['id']).values()
|
|
|
+ channels = []
|
|
|
+ for ucs in ucs_qs:
|
|
|
+ channel = {
|
|
|
+ 'channel': ucs['channel'],
|
|
|
+ 'pir_audio': ucs['pir_audio'],
|
|
|
+ 'mic_audio': ucs['mic_audio'],
|
|
|
+ 'battery_status': ucs['battery_status'],
|
|
|
+ 'battery_level': ucs['battery_level'],
|
|
|
+ 'sleep_status': ucs['sleep_status'],
|
|
|
+ 'sleep_time': ucs['sleep_time'],
|
|
|
+ 'light_night_model': ucs['light_night_model'],
|
|
|
+ 'light_alarm_type': ucs['light_alarm_type'],
|
|
|
+ 'light_alarm_level': ucs['light_alarm_level'],
|
|
|
+ 'light_alarm_man_en': ucs['light_alarm_man_en'],
|
|
|
+ 'light_alarm_vol': ucs['light_alarm_vol'],
|
|
|
+ 'light_long_light': ucs['light_long_light']
|
|
|
}
|
|
|
- # 从uid_channel里面取出通道配置信息
|
|
|
- ucs_qs = UidChannelSetModel.objects.filter(uid__id=us['id']).values()
|
|
|
- channels = []
|
|
|
- for ucs in ucs_qs:
|
|
|
- channel = {
|
|
|
- 'channel': ucs['channel'],
|
|
|
- 'pir_audio': ucs['pir_audio'],
|
|
|
- 'mic_audio': ucs['mic_audio'],
|
|
|
- 'battery_status': ucs['battery_status'],
|
|
|
- 'battery_level': ucs['battery_level'],
|
|
|
- 'sleep_status': ucs['sleep_status'],
|
|
|
- 'sleep_time': ucs['sleep_time'],
|
|
|
- 'light_night_model': ucs['light_night_model'],
|
|
|
- 'light_alarm_type': ucs['light_alarm_type'],
|
|
|
- 'light_alarm_level': ucs['light_alarm_level'],
|
|
|
- 'light_alarm_man_en': ucs['light_alarm_man_en'],
|
|
|
- 'light_alarm_vol': ucs['light_alarm_vol'],
|
|
|
- 'light_long_light': ucs['light_long_light']
|
|
|
- }
|
|
|
- channels.append(channel)
|
|
|
- uv_dict[us['uid']]['channels'] = channels
|
|
|
+ channels.append(channel)
|
|
|
+ uv_dict[us['uid']]['channels'] = channels
|
|
|
|
|
|
- for p in dvls:
|
|
|
- p['vod'] = []
|
|
|
- for dm in ubqs:
|
|
|
- if p['UID'] == dm['uid']:
|
|
|
- if dm['endTime'] > nowTime:
|
|
|
- p['vod'].append(dm)
|
|
|
- p['preview'] = []
|
|
|
- for up in upqs:
|
|
|
- if p['UID'] == up['uid']:
|
|
|
- obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
|
|
|
- img_sign = bucket.sign_url('GET', obj, 300)
|
|
|
- p['preview'].append(img_sign)
|
|
|
- p_uid = p['UID']
|
|
|
- if p_uid in uv_dict:
|
|
|
- # 设备版本号
|
|
|
- p['uid_version'] = uv_dict[p_uid]['version']
|
|
|
- p['ucode'] = uv_dict[p_uid]['ucode']
|
|
|
- p['detect_interval'] = uv_dict[p_uid]['detect_interval']
|
|
|
- p['detect_status'] = uv_dict[p_uid]['detect_status']
|
|
|
- p['detect_group'] = uv_dict[p_uid]['detect_group']
|
|
|
- p['region_alexa'] = uv_dict[p_uid]['region_alexa']
|
|
|
- p['is_alexa'] = uv_dict[p_uid]['is_alexa']
|
|
|
- p['deviceModel'] = uv_dict[p_uid]['deviceModel']
|
|
|
- p['TimeZone'] = uv_dict[p_uid]['TimeZone']
|
|
|
- p['TimeStatus'] = uv_dict[p_uid]['TimeStatus']
|
|
|
- p['SpaceUsable'] = uv_dict[p_uid]['SpaceUsable']
|
|
|
- p['SpaceSum'] = uv_dict[p_uid]['SpaceSum']
|
|
|
- p['MirrorType'] = uv_dict[p_uid]['MirrorType']
|
|
|
- p['RecordType'] = uv_dict[p_uid]['RecordType']
|
|
|
- p['OutdoorModel'] = uv_dict[p_uid]['OutdoorModel']
|
|
|
- p['WIFIName'] = uv_dict[p_uid]['WIFIName']
|
|
|
- p['isDetector'] = uv_dict[p_uid]['isDetector']
|
|
|
- p['DetectorRank'] = uv_dict[p_uid]['DetectorRank']
|
|
|
- p['channels'] = uv_dict[p_uid]['channels']
|
|
|
- # 设备昵称 调用影子信息昵称,先阶段不可
|
|
|
- if uv_dict[p_uid]['nickname']:
|
|
|
- p['NickName'] = uv_dict[p_uid]['nickname']
|
|
|
- else:
|
|
|
- # 设备版本号
|
|
|
- p['uid_version'] = ''
|
|
|
- p['ucode'] = ''
|
|
|
- data.append(p)
|
|
|
- # 缓存时间为一个钟
|
|
|
- redisObj.set_data(key='uid_qs_'+userID, val=json.dumps(data), expire=3600)
|
|
|
- result = data
|
|
|
- print('分页')
|
|
|
- # items=[]
|
|
|
- # for index, item in enumerate(data):
|
|
|
- # if (page - 1) * line <= index:
|
|
|
- # if index < page * line:
|
|
|
- # item['View_Password']=self.encrypt_pwd(item['View_Password'])
|
|
|
- # items.append(item)
|
|
|
- # return response.json(0, items)
|
|
|
- else:
|
|
|
- # print('去缓存找数据')
|
|
|
- # redis_value = redis_value.replace("'", '"')
|
|
|
- redis_value = redis_value.replace('"isShare": True', '"isShare": true')
|
|
|
- redis_value = redis_value.replace('"isShare": False', '"isShare": false')
|
|
|
- redis_value = redis_value.replace('"isDetector": False', '"isDetector": false')
|
|
|
- redis_value = redis_value.replace('"isDetector": True', '"isDetector": true')
|
|
|
- redis_value = redis_value.replace('"version": None', '"version": ""')
|
|
|
- try:
|
|
|
- redis_value = json.loads(redis_value)
|
|
|
- except Exception as e:
|
|
|
- print(repr(e))
|
|
|
- return response.json(0, redis_value)
|
|
|
- result = redis_value
|
|
|
+ for p in dvls:
|
|
|
+ p['vod'] = []
|
|
|
+ for dm in ubqs:
|
|
|
+ if p['UID'] == dm['uid']:
|
|
|
+ if dm['endTime'] > nowTime:
|
|
|
+ p['vod'].append(dm)
|
|
|
+ p['preview'] = []
|
|
|
+ for up in upqs:
|
|
|
+ if p['UID'] == up['uid']:
|
|
|
+ obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
|
|
|
+ img_sign = bucket.sign_url('GET', obj, 300)
|
|
|
+ p['preview'].append(img_sign)
|
|
|
+ p_uid = p['UID']
|
|
|
+ if p_uid in uv_dict:
|
|
|
+ # 设备版本号
|
|
|
+ p['uid_version'] = uv_dict[p_uid]['version']
|
|
|
+ p['ucode'] = uv_dict[p_uid]['ucode']
|
|
|
+ p['detect_interval'] = uv_dict[p_uid]['detect_interval']
|
|
|
+ p['detect_status'] = uv_dict[p_uid]['detect_status']
|
|
|
+ p['detect_group'] = uv_dict[p_uid]['detect_group']
|
|
|
+ p['region_alexa'] = uv_dict[p_uid]['region_alexa']
|
|
|
+ p['is_alexa'] = uv_dict[p_uid]['is_alexa']
|
|
|
+ p['deviceModel'] = uv_dict[p_uid]['deviceModel']
|
|
|
+ p['TimeZone'] = uv_dict[p_uid]['TimeZone']
|
|
|
+ p['TimeStatus'] = uv_dict[p_uid]['TimeStatus']
|
|
|
+ p['SpaceUsable'] = uv_dict[p_uid]['SpaceUsable']
|
|
|
+ p['SpaceSum'] = uv_dict[p_uid]['SpaceSum']
|
|
|
+ p['MirrorType'] = uv_dict[p_uid]['MirrorType']
|
|
|
+ p['RecordType'] = uv_dict[p_uid]['RecordType']
|
|
|
+ p['OutdoorModel'] = uv_dict[p_uid]['OutdoorModel']
|
|
|
+ p['WIFIName'] = uv_dict[p_uid]['WIFIName']
|
|
|
+ p['isDetector'] = uv_dict[p_uid]['isDetector']
|
|
|
+ p['DetectorRank'] = uv_dict[p_uid]['DetectorRank']
|
|
|
+ p['channels'] = uv_dict[p_uid]['channels']
|
|
|
+ # 设备昵称 调用影子信息昵称,先阶段不可
|
|
|
+ if uv_dict[p_uid]['nickname']:
|
|
|
+ p['NickName'] = uv_dict[p_uid]['nickname']
|
|
|
+ else:
|
|
|
+ # 设备版本号
|
|
|
+ p['uid_version'] = ''
|
|
|
+ p['ucode'] = ''
|
|
|
+ data.append(p)
|
|
|
+ result = data
|
|
|
|
|
|
if NickName:
|
|
|
# print('NickName搜索缓存')
|