查询loocam设备首页列表返回isSupportFourPoint,修复十进制转星期周期存在问题

Controller/SensorGateway/EquipmentFamilyController.py

@@ -422,7 +422,7 @@ class EquipmentFamilyView(View):
                     'SpaceSum', 'MirrorType', 'RecordType',
                     'OutdoorModel', 'WIFIName', 'isDetector',
                     'DetectorRank', 'is_human', 'is_custom_voice',
-                    'is_ptz', 'double_wifi', 'is_ai')
+                    'is_ptz', 'double_wifi', 'is_ai', 'isSupportFourPoint')
         uid_set_dict = {}
         for us in uid_set_qs:
             uid_set_dict[us['uid']] = {
@@ -450,7 +450,8 @@ class EquipmentFamilyView(View):
                 'is_ptz': us['is_ptz'],
                 'double_wifi': us['double_wifi'],
                 'is_ai': us['is_ai'],
-                'ai_type': us['ai_type']
+                'ai_type': us['ai_type'],
+                'isSupportFourPoint': us['isSupportFourPoint'],
             }
             # 从uid_channel里面取出通道配置信息
             uid_channel_set_qs = UidChannelSetModel.objects.filter(uid__id=us['id']) \
@@ -570,6 +571,7 @@ class EquipmentFamilyView(View):
                 p['double_wifi'] = uid_set_dict[p_uid]['double_wifi']
                 p['is_ai'] = uid_set_dict[p_uid]['is_ai']
                 p['ai_type'] = uid_set_dict[p_uid]['ai_type']
+                p['isSupportFourPoint'] = uid_set_dict[p_uid]['isSupportFourPoint']
                 # 设备昵称 调用影子信息昵称，先阶段不可
                 if uid_set_dict[p_uid]['nickname']:
                     p['NickName'] = uid_set_dict[p_uid]['nickname']

Controller/SensorGateway/SmartSceneController.py

@@ -1379,6 +1379,8 @@ class SmartSceneView(View):
         for i, bit in enumerate(bin_str):
             if bit == '1':
                 week = i + 1 + next_day
+                if week == 8:
+                    week = 1
                 weeks += str(week) + ','
         # 删除最后一个逗号并返回结果
         return weeks[:-1]