Merge branch 'Bin_Local_User' into dev

Controller/UidSetController.py

@@ -425,6 +425,8 @@ class UidSetView(View):
         end_y = request_dict.get('end_y', None)
         start_time = request_dict.get('start_time', None)
         end_time = request_dict.get('end_time', None)
+        repeat_day = request_dict.get('repeat_day', None)
+        direction = request_dict.get('direction', None)
 
         if uid and channel:
             channel = int(channel)
@@ -462,6 +464,12 @@ class UidSetView(View):
                 if end_time:
                     ucs['voice_end_time'] = end_time
 
+                if repeat_day:
+                    ucs['voice_repeat_day'] = repeat_day
+
+                if direction:
+                    ucs['voice_direction'] = direction
+
                 uid_channel_set_qs = UidChannelSetModel.objects.filter(uid__uid=uid, channel=channel)
                 if not uid_channel_set_qs.exists():
                     uidObject = UidSetModel.objects.filter(uid=uid)

Controller/VoicePromptController.py

@@ -187,6 +187,8 @@ class VoicePromptView(View):
                 res['end_y'] = channel_qs[0]['voice_end_y']
                 res['start_time'] = channel_qs[0]['voice_start_time']
                 res['end_time'] = channel_qs[0]['voice_end_time']
+                res['repeat_day'] = channel_qs[0]['voice_repeat_day']
+                res['direction'] = channel_qs[0]['voice_direction']
 
             enter_systems = []
             leave_systems = []

Model/models.py

@@ -778,6 +778,7 @@ class UidChannelSetModel(models.Model):
     voice_start_time = models.IntegerField(default=0, verbose_name='语音执行的起始时间')
     voice_end_time = models.IntegerField(default=0, verbose_name='语音执行的结束时间')
     voice_repeat_day = models.IntegerField(default=0, verbose_name='语音执行的日期，周几')
+    voice_direction = models.IntegerField(default=0, verbose_name='语音方向。')
 
     class Meta:
         db_table = 'uid_channel'