|
|
@@ -290,27 +290,69 @@ class SerialView(View):
|
|
|
iotdeviceInfoModel.objects.create(**iot_data)
|
|
|
|
|
|
# 同步uid_set数据
|
|
|
- if res_data.get('ucode') is not None:
|
|
|
+ if res_data.get('uid_set') is not None:
|
|
|
uid_set_qs = UidSetModel.objects.filter(uid=uid)
|
|
|
uid_set_data = {
|
|
|
- 'ucode': res_data['ucode'],
|
|
|
- 'version': res_data['version'],
|
|
|
- 'tz': res_data['tz'],
|
|
|
- 'ip': res_data['ip'],
|
|
|
- 'is_human': res_data['is_human'],
|
|
|
- 'is_custom_voice': res_data['is_custom_voice'],
|
|
|
- 'double_wifi': res_data['double_wifi'],
|
|
|
- 'isSupportFourPoint': res_data['isSupportFourPoint'],
|
|
|
- 'mobile_4g': res_data['mobile_4g'],
|
|
|
- 'is_ptz': res_data['is_ptz'],
|
|
|
- 'is_ai': res_data['is_ai'],
|
|
|
- 'cloud_vod': res_data['cloud_vod'],
|
|
|
- 'is_alexa': res_data['is_alexa'],
|
|
|
- 'ai_type': res_data['ai_type']
|
|
|
+ 'channel': res_data['uid_set']['channel'],
|
|
|
+ 'detect_status': res_data['uid_set']['detect_status'],
|
|
|
+ 'detect_interval': res_data['uid_set']['detect_interval'],
|
|
|
+
|
|
|
+ 'addTime': res_data['uid_set']['addTime'],
|
|
|
+ 'updTime': res_data['uid_set']['updTime'],
|
|
|
+ 'ucode': res_data['uid_set']['ucode'],
|
|
|
+
|
|
|
+ 'version': res_data['uid_set']['version'],
|
|
|
+ 'p2p_region': res_data['uid_set']['p2p_region'],
|
|
|
+ 'tz': res_data['uid_set']['tz'],
|
|
|
+
|
|
|
+ 'video_code': res_data['uid_set']['video_code'],
|
|
|
+ 'nickname': res_data['uid_set']['nickname'],
|
|
|
+ 'ip': res_data['uid_set']['ip'],
|
|
|
+
|
|
|
+ 'detect_group': res_data['uid_set']['detect_group'],
|
|
|
+ 'pwd': res_data['uid_set']['pwd'],
|
|
|
+ 'resetTime': res_data['uid_set']['resetTime'],
|
|
|
+
|
|
|
+ 'region_alexa': res_data['uid_set']['region_alexa'],
|
|
|
+ 'deviceModel': res_data['uid_set']['deviceModel'],
|
|
|
+ 'TimeZone': res_data['uid_set']['TimeZone'],
|
|
|
+
|
|
|
+ 'TimeStatus': res_data['uid_set']['TimeStatus'],
|
|
|
+ 'SpaceUsable': res_data['uid_set']['SpaceUsable'],
|
|
|
+ 'SpaceSum': res_data['uid_set']['SpaceSum'],
|
|
|
+
|
|
|
+ 'MirrorType': res_data['uid_set']['MirrorType'],
|
|
|
+ 'RecordType': res_data['uid_set']['RecordType'],
|
|
|
+ 'OutdoorModel': res_data['uid_set']['OutdoorModel'],
|
|
|
+
|
|
|
+ 'WIFIName': res_data['uid_set']['WIFIName'],
|
|
|
+ 'isDetector': res_data['uid_set']['isDetector'],
|
|
|
+ 'DetectorRank': res_data['uid_set']['DetectorRank'],
|
|
|
+
|
|
|
+ 'is_human': res_data['uid_set']['is_human'],
|
|
|
+ 'is_custom_voice': res_data['uid_set']['is_custom_voice'],
|
|
|
+ 'double_wifi': res_data['uid_set']['double_wifi'],
|
|
|
+
|
|
|
+ 'isSupportFourPoint': res_data['uid_set']['isSupportFourPoint'],
|
|
|
+ 'mobile_4g': res_data['uid_set']['mobile_4g'],
|
|
|
+ 'is_ptz': res_data['uid_set']['is_ptz'],
|
|
|
+
|
|
|
+ 'is_ai': res_data['uid_set']['is_ai'],
|
|
|
+ 'cloud_vod': res_data['uid_set']['cloud_vod'],
|
|
|
+ 'is_alexa': res_data['uid_set']['is_alexa'],
|
|
|
+
|
|
|
+ 'is_notification': res_data['uid_set']['is_notification'],
|
|
|
+ 'new_detect_interval': res_data['uid_set']['new_detect_interval'],
|
|
|
+ 'tb_country': res_data['uid_set']['tb_country'],
|
|
|
+
|
|
|
+ 'device_type': res_data['uid_set']['device_type'],
|
|
|
+ 'ai_type': res_data['uid_set']['ai_type'],
|
|
|
+ 'msg_notify': res_data['uid_set']['msg_notify']
|
|
|
}
|
|
|
if uid_set_qs.exists():
|
|
|
uid_set_qs.update(**uid_set_data)
|
|
|
else:
|
|
|
+ uid_set_data['uid'] = uid
|
|
|
UidSetModel.objects.create(**uid_set_data)
|
|
|
|
|
|
# 记录操作日志
|
|
|
@@ -378,24 +420,65 @@ class SerialView(View):
|
|
|
res_data['token_iot_number'] = iot_device_info_qs[0]['token_iot_number']
|
|
|
|
|
|
# 查询uid_set数据
|
|
|
- uid_set_qs = UidSetModel.objects.filter(uid=uid).values(
|
|
|
- 'ucode', 'version', 'tz', 'ip', 'is_human', 'is_custom_voice', 'double_wifi', 'isSupportFourPoint',
|
|
|
- 'mobile_4g', 'is_ptz', 'is_ai', 'cloud_vod', 'is_alexa', 'ai_type')
|
|
|
+ uid_set_qs = UidSetModel.objects.filter(uid=uid).values()
|
|
|
if uid_set_qs.exists():
|
|
|
- res_data['ucode'] = uid_set_qs[0]['ucode']
|
|
|
- res_data['version'] = uid_set_qs[0]['version']
|
|
|
- res_data['tz'] = uid_set_qs[0]['tz']
|
|
|
- res_data['ip'] = uid_set_qs[0]['ip']
|
|
|
- res_data['is_human'] = uid_set_qs[0]['is_human']
|
|
|
- res_data['is_custom_voice'] = uid_set_qs[0]['is_custom_voice']
|
|
|
- res_data['double_wifi'] = uid_set_qs[0]['double_wifi']
|
|
|
- res_data['isSupportFourPoint'] = uid_set_qs[0]['isSupportFourPoint']
|
|
|
- res_data['mobile_4g'] = uid_set_qs[0]['mobile_4g']
|
|
|
- res_data['is_ptz'] = uid_set_qs[0]['is_ptz']
|
|
|
- res_data['is_ai'] = uid_set_qs[0]['is_ai']
|
|
|
- res_data['cloud_vod'] = uid_set_qs[0]['cloud_vod']
|
|
|
- res_data['is_alexa'] = uid_set_qs[0]['is_alexa']
|
|
|
- res_data['ai_type'] = uid_set_qs[0]['ai_type']
|
|
|
+ res_data['uid_set'] = {}
|
|
|
+
|
|
|
+ res_data['uid_set']['channel'] = uid_set_qs[0]['channel']
|
|
|
+ res_data['uid_set']['detect_status'] = uid_set_qs[0]['detect_status']
|
|
|
+ res_data['uid_set']['detect_interval'] = uid_set_qs[0]['detect_interval']
|
|
|
+
|
|
|
+ res_data['uid_set']['addTime'] = uid_set_qs[0]['addTime']
|
|
|
+ res_data['uid_set']['updTime'] = uid_set_qs[0]['updTime']
|
|
|
+ res_data['uid_set']['ucode'] = uid_set_qs[0]['ucode']
|
|
|
+
|
|
|
+ res_data['uid_set']['version'] = uid_set_qs[0]['version']
|
|
|
+ res_data['uid_set']['p2p_region'] = uid_set_qs[0]['p2p_region']
|
|
|
+ res_data['uid_set']['tz'] = uid_set_qs[0]['tz']
|
|
|
+
|
|
|
+ res_data['uid_set']['video_code'] = uid_set_qs[0]['video_code']
|
|
|
+ res_data['uid_set']['nickname'] = uid_set_qs[0]['nickname']
|
|
|
+ res_data['uid_set']['ip'] = uid_set_qs[0]['ip']
|
|
|
+
|
|
|
+ res_data['uid_set']['detect_group'] = uid_set_qs[0]['detect_group']
|
|
|
+ res_data['uid_set']['pwd'] = uid_set_qs[0]['pwd']
|
|
|
+ res_data['uid_set']['resetTime'] = uid_set_qs[0]['resetTime']
|
|
|
+
|
|
|
+ res_data['uid_set']['region_alexa'] = uid_set_qs[0]['region_alexa']
|
|
|
+ res_data['uid_set']['deviceModel'] = uid_set_qs[0]['deviceModel']
|
|
|
+ res_data['uid_set']['TimeZone'] = uid_set_qs[0]['TimeZone']
|
|
|
+
|
|
|
+ res_data['uid_set']['TimeStatus'] = uid_set_qs[0]['TimeStatus']
|
|
|
+ res_data['uid_set']['SpaceUsable'] = uid_set_qs[0]['SpaceUsable']
|
|
|
+ res_data['uid_set']['SpaceSum'] = uid_set_qs[0]['SpaceSum']
|
|
|
+
|
|
|
+ res_data['uid_set']['MirrorType'] = uid_set_qs[0]['MirrorType']
|
|
|
+ res_data['uid_set']['RecordType'] = uid_set_qs[0]['RecordType']
|
|
|
+ res_data['uid_set']['OutdoorModel'] = uid_set_qs[0]['OutdoorModel']
|
|
|
+
|
|
|
+ res_data['uid_set']['WIFIName'] = uid_set_qs[0]['WIFIName']
|
|
|
+ res_data['uid_set']['isDetector'] = uid_set_qs[0]['isDetector']
|
|
|
+ res_data['uid_set']['DetectorRank'] = uid_set_qs[0]['DetectorRank']
|
|
|
+
|
|
|
+ res_data['uid_set']['is_human'] = uid_set_qs[0]['is_human']
|
|
|
+ res_data['uid_set']['is_custom_voice'] = uid_set_qs[0]['is_custom_voice']
|
|
|
+ res_data['uid_set']['double_wifi'] = uid_set_qs[0]['double_wifi']
|
|
|
+
|
|
|
+ res_data['uid_set']['isSupportFourPoint'] = uid_set_qs[0]['isSupportFourPoint']
|
|
|
+ res_data['uid_set']['mobile_4g'] = uid_set_qs[0]['mobile_4g']
|
|
|
+ res_data['uid_set']['is_ptz'] = uid_set_qs[0]['is_ptz']
|
|
|
+
|
|
|
+ res_data['uid_set']['is_ai'] = uid_set_qs[0]['is_ai']
|
|
|
+ res_data['uid_set']['cloud_vod'] = uid_set_qs[0]['cloud_vod']
|
|
|
+ res_data['uid_set']['is_alexa'] = uid_set_qs[0]['is_alexa']
|
|
|
+
|
|
|
+ res_data['uid_set']['is_notification'] = uid_set_qs[0]['is_notification']
|
|
|
+ res_data['uid_set']['new_detect_interval'] = uid_set_qs[0]['new_detect_interval']
|
|
|
+ res_data['uid_set']['tb_country'] = uid_set_qs[0]['tb_country']
|
|
|
+
|
|
|
+ res_data['uid_set']['device_type'] = uid_set_qs[0]['device_type']
|
|
|
+ res_data['uid_set']['ai_type'] = uid_set_qs[0]['ai_type']
|
|
|
+ res_data['uid_set']['msg_notify'] = uid_set_qs[0]['msg_notify']
|
|
|
|
|
|
# 修改序列号状态为占用,uid状态为3(数据被同步)
|
|
|
CompanySerialModel.objects.filter(serial_number=serial).update(status=3)
|
