优化查询消息列表接口

Controller/DetectControllerV2.py

@@ -11,7 +11,7 @@ from django.views.generic.base import View
 
 from Ansjer.config import DETECT_PUSH_DOMAIN, DETECT_PUSH_DOMAINS, DETECT_PUSH_DOMAIN_JIUAN, DETECT_PUSH_DOMAINS_JIUAN, \
     OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, LOGGER, ALGORITHM_COMBO_TYPES
-from Ansjer.config import PUSH_BUCKET
+from Ansjer.config import PUSH_BUCKET, CONFIG_INFO, CONFIG_CN
 from Model.models import Device_Info, Equipment_Info, UidSetModel, UidPushModel, CompanyModel, SysMsgModel, \
     AiService, VodBucketModel
 from Object.ETkObject import ETkObject
@@ -334,7 +334,8 @@ class DetectControllerViewV2(View):
                 # 默认查询近七天内数据
                 end_time = int(time.time())
                 start_time = LocalDateTimeUtil.get_before_days_timestamp(end_time, 7)
-
+            # oci获取图片链接太慢了 app默认20条 暂时先减少分页条数
+            line = 10 if CONFIG_INFO != CONFIG_CN else line
             equipment_info_qs, count = EquipmentInfoService. \
                 union_equipment_info(userID, uid_list, event_type, start_time, end_time, page, line)
 
@@ -371,8 +372,9 @@ class DetectControllerViewV2(View):
                 config=botocore.client.Config(signature_version='s3v4'),
                 region_name='cn-northwest-1'
             )
-            oci_eur = OCIObjectStorage('eur')
-            oci_us = OCIObjectStorage('us')
+            # 国内生产环境默认不实例OCI对象
+            oci_eur = None if CONFIG_INFO == CONFIG_CN else OCIObjectStorage('eur')
+            oci_us = None if CONFIG_INFO == CONFIG_CN else OCIObjectStorage('us')
             redis_obj = RedisObject(3)
             # ai消息标识所有组合标签
             ai_all_event_type = EquipmentInfoService.get_all_comb_event_type()
@@ -511,6 +513,8 @@ class DetectControllerViewV2(View):
         @param obj_name: 对象名称
         @return: url
         """
+        if not oci:
+            return ''
         time_expires = datetime.datetime.utcnow() + datetime.timedelta(minutes=10)
         result = oci.get_preauthenticated_request_url(PUSH_BUCKET, 'ociPush', obj_name, time_expires)
         return result.full_path if result else ''