Browse Source

UidChannelSetModel测试环境注释

chenshibin 4 years ago
parent
commit
75367a9823
2 changed files with 44 additions and 44 deletions
  1. 6 6
      Controller/ShadowController.py
  2. 38 38
      Model/models.py

+ 6 - 6
Controller/ShadowController.py

@@ -22,7 +22,7 @@ from Object.LogUtil import LogUtil
 from Object.ResponseObject import ResponseObject
 from Object.ETkObject import ETkObject
 import time
-from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel
+from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket
 from Service.CommonService import CommonService
 from django.http import JsonResponse
 from Object.UidTokenObject import UidTokenObject
@@ -78,11 +78,11 @@ def update_device_shadow(request):
     if is_reset == '1':
         logger.info('设备重置: {}'.format(uid))
 
-        # 重置语音提示
-        uid_channel_qs = UidChannelSetModel.objects.filter(uid__uid=uid)
-        if uid_channel_qs.exists():
-            uid_channel_qs.update(voice_prompt_intelligent_mute=0, voice_prompt_status=0, voice_prompt_enter=0,
-                           voice_prompt_leave=0)
+        # # 重置语音提示
+        # uid_channel_qs = UidChannelSetModel.objects.filter(uid__uid=uid)
+        # if uid_channel_qs.exists():
+        #     uid_channel_qs.update(voice_prompt_intelligent_mute=0, voice_prompt_status=0, voice_prompt_enter=0,
+        #                    voice_prompt_leave=0)
 
         # 删除uid_set数据
         UidSetModel.objects.filter(uid=uid).delete()

+ 38 - 38
Model/models.py

@@ -492,41 +492,41 @@ class UID_Bucket(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
-
-# 设备通道配置
-class UidChannelSetModel(models.Model):
-    id = models.AutoField(primary_key=True, verbose_name='自增id')
-    uid = models.ForeignKey(UidSetModel, to_field='id', on_delete=models.CASCADE)
-    channel = models.IntegerField(default=1, verbose_name='通道号')
-    channel_name = models.CharField(blank=True, default='', max_length=20, verbose_name=u'通道名')
-    pir_audio = models.SmallIntegerField(default=0, verbose_name='pir声音。0:关闭,1:开启')
-    mic_audio = models.SmallIntegerField(default=0, verbose_name='mic声音。0:关闭,1:开启')
-    battery_status = models.SmallIntegerField(default=0, verbose_name='低电量提醒状态。0:关闭,1:开启')
-    battery_level = models.SmallIntegerField(default=0, verbose_name='低电量提醒级别。0: 低于10%;1:低于25%;2:低于50%;3:低于75%')
-    sleep_status = models.SmallIntegerField(default=0, verbose_name='是否开启【休眠通知】。0:关闭;1:开启')
-    sleep_time = models.SmallIntegerField(default=0, verbose_name='摄像机进入休眠时间。0:不休眠;1:10秒;2:20秒;3:30秒')
-    light_night_model = models.IntegerField(default=0, verbose_name='夜视模式')  # 0:全彩模式,1:黑白模式,2:智能夜视模式
-    light_alarm_type = models.IntegerField(default=0, verbose_name='警报人形类型')  # 0为人形,1为移动,3是人形和移动侦测0x0f
-    # 声光报警级别: 0: 关闭,1:强烈声光告警,2:轻微声光告警,3: 强烈声告警,4:轻微声告警,5:强烈光告警
-    light_alarm_level = models.IntegerField(default=0, verbose_name='声光报警级别')
-    light_alarm_man_en = models.IntegerField(default=0, verbose_name='人为告警状态')  # 0:关,1:开
-    light_alarm_vol = models.IntegerField(default=0, verbose_name='报警音量')  # 音量值0-100
-    light_long_light = models.IntegerField(default=0, verbose_name='长亮')
-    voice_prompt_status = models.SmallIntegerField(default=0, verbose_name='个性语音提示快关。0:关闭,1:开启')
-    voice_prompt_enter = models.IntegerField(default=0, verbose_name='进入铃声id')
-    voice_prompt_leave = models.IntegerField(default=0, verbose_name='离开铃声id')
-    voice_prompt_intelligent_mute = models.SmallIntegerField(default=0, verbose_name='智能静音。0:关闭,1:开启')
-    voice_start_x = models.FloatField(default=0, verbose_name='起始坐标的x')
-    voice_start_y = models.FloatField(default=18, verbose_name='起始坐标的y')
-    voice_end_x = models.FloatField(default=44, verbose_name='结束坐标的x')
-    voice_end_y = models.FloatField(default=18, verbose_name='结束坐标的y')
-    voice_start_time = models.IntegerField(default=0, verbose_name='语音执行的起始时间')
-    voice_end_time = models.IntegerField(default=0, verbose_name='语音执行的结束时间')
-    voice_repeat_day = models.IntegerField(default=127, verbose_name='语音执行的日期,周几')
-    voice_direction = models.IntegerField(default=0, verbose_name='语音方向。')
-
-    class Meta:
-        db_table = 'uid_channel'
-        verbose_name = '设备通道设置'
-        verbose_name_plural = verbose_name
-        app_label = "db1"
+#
+# # 设备通道配置
+# class UidChannelSetModel(models.Model):
+#     id = models.AutoField(primary_key=True, verbose_name='自增id')
+#     uid = models.ForeignKey(UidSetModel, to_field='id', on_delete=models.CASCADE)
+#     channel = models.IntegerField(default=1, verbose_name='通道号')
+#     channel_name = models.CharField(blank=True, default='', max_length=20, verbose_name=u'通道名')
+#     pir_audio = models.SmallIntegerField(default=0, verbose_name='pir声音。0:关闭,1:开启')
+#     mic_audio = models.SmallIntegerField(default=0, verbose_name='mic声音。0:关闭,1:开启')
+#     battery_status = models.SmallIntegerField(default=0, verbose_name='低电量提醒状态。0:关闭,1:开启')
+#     battery_level = models.SmallIntegerField(default=0, verbose_name='低电量提醒级别。0: 低于10%;1:低于25%;2:低于50%;3:低于75%')
+#     sleep_status = models.SmallIntegerField(default=0, verbose_name='是否开启【休眠通知】。0:关闭;1:开启')
+#     sleep_time = models.SmallIntegerField(default=0, verbose_name='摄像机进入休眠时间。0:不休眠;1:10秒;2:20秒;3:30秒')
+#     light_night_model = models.IntegerField(default=0, verbose_name='夜视模式')  # 0:全彩模式,1:黑白模式,2:智能夜视模式
+#     light_alarm_type = models.IntegerField(default=0, verbose_name='警报人形类型')  # 0为人形,1为移动,3是人形和移动侦测0x0f
+#     # 声光报警级别: 0: 关闭,1:强烈声光告警,2:轻微声光告警,3: 强烈声告警,4:轻微声告警,5:强烈光告警
+#     light_alarm_level = models.IntegerField(default=0, verbose_name='声光报警级别')
+#     light_alarm_man_en = models.IntegerField(default=0, verbose_name='人为告警状态')  # 0:关,1:开
+#     light_alarm_vol = models.IntegerField(default=0, verbose_name='报警音量')  # 音量值0-100
+#     light_long_light = models.IntegerField(default=0, verbose_name='长亮')
+#     voice_prompt_status = models.SmallIntegerField(default=0, verbose_name='个性语音提示快关。0:关闭,1:开启')
+#     voice_prompt_enter = models.IntegerField(default=0, verbose_name='进入铃声id')
+#     voice_prompt_leave = models.IntegerField(default=0, verbose_name='离开铃声id')
+#     voice_prompt_intelligent_mute = models.SmallIntegerField(default=0, verbose_name='智能静音。0:关闭,1:开启')
+#     voice_start_x = models.FloatField(default=0, verbose_name='起始坐标的x')
+#     voice_start_y = models.FloatField(default=18, verbose_name='起始坐标的y')
+#     voice_end_x = models.FloatField(default=44, verbose_name='结束坐标的x')
+#     voice_end_y = models.FloatField(default=18, verbose_name='结束坐标的y')
+#     voice_start_time = models.IntegerField(default=0, verbose_name='语音执行的起始时间')
+#     voice_end_time = models.IntegerField(default=0, verbose_name='语音执行的结束时间')
+#     voice_repeat_day = models.IntegerField(default=127, verbose_name='语音执行的日期,周几')
+#     voice_direction = models.IntegerField(default=0, verbose_name='语音方向。')
+#
+#     class Meta:
+#         db_table = 'uid_channel'
+#         verbose_name = '设备通道设置'
+#         verbose_name_plural = verbose_name
+#         app_label = "db1"