Эх сурвалжийг харах

返回算法小店场景图片地址

zhangdongming 2 жил өмнө
parent
commit
87b33db786

+ 8 - 2
Controller/AlgorithmShop/AlgorithmShopController.py

@@ -152,7 +152,7 @@ class AlgorithmShopView(View):
             if not lang:
                 return response.json(444)
             # 获取应用场景列表
-            scenario_qs = DeviceAppScenario.objects.all().order_by('sort') \
+            scenario_qs = DeviceAppScenario.objects.filter().exclude(type=0).all().order_by('sort') \
                 .values('id', 'type', 'cver_url', 'banner_url')
             scenario_list = []
             if not scenario_qs.exists():
@@ -176,7 +176,13 @@ class AlgorithmShopView(View):
                 .annotate(algorithmId=F('algorithm_type__id'), algorithmType=F('algorithm_type__type'),
                           iconUrl=F('algorithm_type__icon_url'),
                           algorithmName=F('title')).values('algorithmId', 'algorithmType', 'iconUrl', 'algorithmName')
-            result_dto = {'scenarioList': scenario_list, 'scenarioUrl': ''}
+            scenario_qs = DeviceAppScenario.objects.filter(type=0) \
+                .values('cver_url', 'banner_url')
+            scenario_banner = {}
+            if scenario_qs.exists():
+                scenario_banner['cverUrl'] = scenario_qs[0]['cver_url']
+                scenario_banner['bannerUrl'] = scenario_qs[0]['banner_url']
+            result_dto = {'scenarioList': scenario_list, 'scenarioUrl': scenario_banner}
             if algorithm_qs.exists():
                 result_dto['iconList'] = list(algorithm_qs)
             return response.json(0, result_dto)

+ 3 - 2
Model/models.py

@@ -3007,7 +3007,7 @@ class UnicomFlowPush(models.Model):
 
 class DeviceAppScenario(models.Model):
     id = models.AutoField(primary_key=True)
-    # 0:店铺,1:照看长辈,2:看护儿童,3:逗宠专属
+    # 0:用作显示banner图使用,1:店铺,2:照看长辈,3:看护儿童,4:逗宠专属
     type = models.SmallIntegerField(default=0, verbose_name='场景类型')
     sort = models.SmallIntegerField(default=0, verbose_name=u'排序,越小越靠前')
     cver_url = models.CharField(max_length=128, default='', verbose_name='封面图地址')
@@ -3052,7 +3052,8 @@ class DeviceAlgorithmScenario(models.Model):
 
 class DeviceAlgorithmType(models.Model):
     id = models.AutoField(primary_key=True)
-    # 0:移动侦测,1:人形检测,2:挥手识别,3:人脸检测,4:异声感知,5:车辆检测,6:宠物检测,7:绊线入侵,8:离岗检测,9:徘徊检测
+    # 0:移动侦测,1:人形检测,2:挥手识别,3:人脸检测,4:异声感知,5:车辆检测,7:宠物检测,6:哭声检测,8:徘徊检测
+    # 9:区域闯入,10:区域闯出,11:长时间无人检测,12:往来检测,13:云相册
     type = models.SmallIntegerField(default=0, verbose_name='算法类型')
     memory = models.CharField(max_length=32, default='', verbose_name='所需内存')
     down_count = models.IntegerField(default=0, verbose_name='下载次数')