新增是否支持云台字段

Controller/EquipmentManager.py

@@ -939,11 +939,12 @@ def queryInterface(request):
         data = []
         # 设备拓展信息表
         us_qs = UidSetModel.objects.filter(uid__in=uid_list).\
-            values('uid', 'version', 'nickname', 'detect_interval')
+            values('uid', 'version', 'nickname', 'detect_interval', 'is_ptz')
         uv_dict = {}
         for us in us_qs:
             uv_dict[us['uid']] = {'version': us['version'],
                                   'nickname': us['nickname'],
+                                  'is_ptz': us['is_ptz'],
                                   'detect_interval': us['detect_interval']}
 
         for p in dvls:
@@ -1012,7 +1013,7 @@ def uid_status(request):
     # 判断用户是否绑定设备
     qs = UidSetModel.objects.filter(uid=uid).values('uid', 'detect_status', 'detect_interval', 'version', 'ucode',
                                                     'p2p_region', 'tz', 'video_code', 'channel', 'cloud_vod', 'id',
-                                                    'detect_group', 'is_alexa', 'region_alexa')
+                                                    'detect_group', 'is_alexa', 'region_alexa','is_ptz')
 
     # 调试
     debugOnes = int(time.time())
@@ -1043,6 +1044,7 @@ def uid_status(request):
             'detect_group': qs[0]['detect_group'],  # 推送组
             'is_alexa': qs[0]['is_alexa'],  # 推送组
             'region_alexa': qs[0]['region_alexa'],  # 推送组
+            'is_ptz': qs[0]['is_ptz']
         }
 
         # 调试

Controller/EquipmentManagerV2.py

@@ -173,7 +173,7 @@ class EquipmentManagerV2(View):
             nowTime = int(time.time())
             data = []
             # 设备拓展信息表
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode','detect_interval', 'is_human', 'is_custom_voice')
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode','detect_interval', 'is_human', 'is_custom_voice', 'is_ptz')
             uv_dict = {}
             for us in us_qs:
                 uv_dict[us['uid']] = {
@@ -183,6 +183,7 @@ class EquipmentManagerV2(View):
                     'detect_interval': us['detect_interval'],
                     'is_human': us['is_human'],
                     'is_custom_voice': us['is_custom_voice'],
+                    'is_ptz': us['is_ptz']
                 }
             for p in dvls:
                 # 新增云分配UID
@@ -216,6 +217,7 @@ class EquipmentManagerV2(View):
                     p['detect_interval'] = uv_dict[p_uid]['detect_interval']
                     p['is_human'] = uv_dict[p_uid]['is_human']
                     p['is_custom_voice'] = uv_dict[p_uid]['is_custom_voice']
+                    p['is_ptz'] = uv_dict[p_uid]['is_ptz']
                     # 设备昵称 调用影子信息昵称，先阶段不可
                     if uv_dict[p_uid]['nickname']:
                         p['NickName'] = uv_dict[p_uid]['nickname']

Controller/EquipmentManagerV3.py

@@ -395,7 +395,7 @@ class EquipmentManagerV3(View):
                                                                     'TimeZone', 'TimeStatus', 'SpaceUsable',
                                                                     'SpaceSum', 'MirrorType', 'RecordType',
                                                                     'OutdoorModel', 'WIFIName', 'isDetector',
-                                                                    'DetectorRank', 'is_human', 'is_custom_voice')
+                                                                    'DetectorRank', 'is_human', 'is_custom_voice', 'is_ptz')
         uv_dict = {}
         for us in us_qs:
             uv_dict[us['uid']] = {
@@ -419,7 +419,8 @@ class EquipmentManagerV3(View):
                 'isDetector': us['isDetector'],
                 'DetectorRank': us['DetectorRank'],
                 'is_human': us['is_human'],
-                'is_custom_voice': us['is_custom_voice']
+                'is_custom_voice': us['is_custom_voice'],
+                'is_ptz': us['is_ptz']
             }
             # 从uid_channel里面取出通道配置信息
             ucs_qs = UidChannelSetModel.objects.filter(uid__id=us['id']).values('channel', 'channel_name',

Controller/ShadowController.py

@@ -102,7 +102,7 @@ def update_device_shadow(request):
         is_human = request_dict.get('is_human', None)
         is_custom_voice = request_dict.get('is_custom', None)
         double_wifi = request_dict.get('double_wifi', None)
-
+        is_ptz = request_dict.get('is_ptz', None)
         us_qs = UidSetModel.objects.filter(uid=uid)
         # 更新
         nowTime = int(time.time())
@@ -138,6 +138,8 @@ def update_device_shadow(request):
             qs_dict['is_custom_voice'] = is_custom_voice
         if double_wifi:
             qs_dict['double_wifi'] = double_wifi
+        if double_wifi:
+            qs_dict['is_ptz'] = is_ptz
         if us_qs.exists():
             if is_alexa and us_qs[0].is_alexa == 0:
                 qs_dict['is_alexa'] = is_alexa

Model/models.py

@@ -776,7 +776,7 @@ class UidSetModel(models.Model):
     is_human = models.IntegerField(default=0, verbose_name='是否支持人形追踪。0：不支持，1：支持')
     is_custom_voice = models.IntegerField(default=0, verbose_name='是否支持自定义语音。0：不支持，1：支持')
     double_wifi = models.IntegerField(default=0, verbose_name='是否支持双频wifi。0：不支持，1：支持')
-
+    is_ptz = models.IntegerField(default=0, verbose_name='是否支持云台。0：不支持，1：支持')
     class Meta:
         db_table = 'uid_set'
         verbose_name = u'设备配置表'