Merge branch 'test' of http://192.168.136.99:3000/servers/ASJPush

 Conflicts:

	Controller/DetectControllerV2.py

Controller/AiController.py

@@ -125,7 +125,7 @@ class AiView(View):
             # photo = open(r'E:\test---------------\test\snipaste20220121_215952.jpg', 'rb')
             # 识别合成图片
             maxLabels = 50  # 最大标签
-            minConfidence = 70  # 置信度
+            minConfidence = 80  # 置信度
 
             ai_start_time = int(time.time())
             client = boto3.client(

Controller/ShadowController.py

@@ -25,7 +25,7 @@ from ratelimit.decorators import ratelimit
 
 from AnsjerPush.config import SERVER_TYPE
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
-    AiService
+    AiService, CountryModel
 from Object.ETkObject import ETkObject
 from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService
@@ -176,6 +176,11 @@ def update_device_shadow(request):
             qs_dict['is_ai'] = is_ai
         if isSupportFourPoint:
             qs_dict['isSupportFourPoint'] = isSupportFourPoint
+        ipInfo = CommonService.getIpIpInfo(ip, 'CN')
+        country_qs = CountryModel.objects.filter(country_code=ipInfo['country_code']).values('id')
+        if country_qs.exists():
+            country = country_qs[0]['id']
+            qs_dict['tb_country'] = country
         logger.info('{} qs_dict: {}'.format(uid, qs_dict))
 
         us_qs = UidSetModel.objects.filter(uid=uid)

Model/models.py

@@ -1135,13 +1135,11 @@ class UidSetModel(models.Model):
     ucode = models.CharField(max_length=32, verbose_name='设备产品码', default='')
     version = models.CharField(max_length=32, verbose_name='设备版本', default='')
     p2p_region = models.CharField(max_length=16, verbose_name='设备p2p区域', default='ALL')  # ALL CN EU US
-    cloud_vod = models.SmallIntegerField(default=2, verbose_name='云存开关')  # 0,关闭，1开启，2,不支持
     tz = models.CharField(default='', max_length=16, verbose_name='设备时区')  # +8
     video_code = models.SmallIntegerField(default=0, verbose_name='编码类型')  # 0:264,1:265
     nickname = models.CharField(default='', max_length=64, verbose_name='设备昵称')
     ip = models.CharField(max_length=20, default='', verbose_name=u'设备ip')
     # 设备重置后第一次启动时间
-    is_alexa = models.IntegerField(default=0, verbose_name='是否支持alexa')  # 0为不支持，1为支持，2为开启alexa发现
     detect_group = models.CharField(default='', max_length=32, verbose_name=u'检测类型')
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')  # 暂时是预留字段
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
@@ -1163,10 +1161,12 @@ class UidSetModel(models.Model):
     isSupportFourPoint = models.SmallIntegerField(default=0, verbose_name='是否支持预置点')  # 0:不支持, 1:支持
     mobile_4g = models.IntegerField(default=0, verbose_name='是否支持4g。0：不支持，1：支持')
     is_ptz = models.IntegerField(default=0, verbose_name='是否支持云台。0：不支持，1：支持')
-    is_vod = models.IntegerField(default=0, verbose_name='是否支持云存储。0：不支持，1：支持')
     is_ai = models.IntegerField(default=2, verbose_name='是否支持ai')  # 0,关闭，1开启，2,不支持
+    cloud_vod = models.SmallIntegerField(default=2, verbose_name='云存开关')  # 0,关闭，1开启，2,不支持
+    is_alexa = models.IntegerField(default=0, verbose_name='是否支持alexa')  # 0为不支持，1为支持，2为开启alexa发现
     is_notification = models.IntegerField(blank=True, default=1, verbose_name='新加-消息提醒开关')  # 0：关闭，1：开启
     new_detect_interval = models.IntegerField(blank=True, verbose_name='新加-消息提醒间隔', default=60)  # 秒
+    tb_country = models.IntegerField(blank=True, default=0, verbose_name='国家')
 
     class Meta:
         db_table = 'uid_set'