250330-1代码。

routers/api/videoResource/videoinfo.py

@@ -365,33 +365,33 @@ async def get_video_forest_fire_list(
     try:
         video_type_list = ['sjyld','sgdfd','jtdd','dzzhyhd']
         # video_code_list = [item[0] for item in db.query(TpVideoTag.id).filter(TpVideoTag.dict_value == '4').all()]
-        video_list = db.query(TpVideoLog).filter(TpVideoLog.area=='茂名市视频数据共享管理平台/茂名市交通运输局')
+        video_list = db.query(TPVideoInfo).filter(TPVideoInfo.regionPath.like('@root00000000@44000000002160847111@%'))
         if video_type:
             if video_type in video_type_list:
 
                 lis = [i.video_code for i in db.query(TpVideoTag.video_code).filter(TpVideoTag.dict_value==video_type , TpVideoTag.del_flag =='0').all()]
-                video_list = video_list.filter(TpVideoLog.video_code.in_(lis))
+                video_list = video_list.filter(TPVideoInfo.gbIndexCode.in_(lis))
         if area:
             if area=='直辖市':
                 lis = [i.video_code for i in db.query(TpVideoLogTransportationAreaInfo.video_code).all()]
-                video_list = video_list.filter(TpVideoLog.video_code.in_(lis))
+                video_list = video_list.filter(TPVideoInfo.gbIndexCode.in_(lis))
             else:
                 lis = [i.video_code for i in db.query(TpVideoLogTransportationAreaInfo.video_code).filter(TpVideoLogTransportationAreaInfo.area == area).all()]
-                video_list = video_list.filter(TpVideoLog.video_code.in_(lis))
+                video_list = video_list.filter(TPVideoInfo.gbIndexCode.in_(lis))
         if name:
-            video_list = video_list.filter(TpVideoLog.name.like(f'%{name}%'))
+            video_list = video_list.filter(TPVideoInfo.name.like(f'%{name}%'))
         # 计算总条目数
         total_items = video_list.count()
         # 排序
 
-        video_list = video_list.order_by(TpVideoLog.video_code)
+        video_list = video_list.order_by(TPVideoInfo.gbIndexCode)
         # 执行分页查询
         # print(video_list.offset((page - 1) * pageSize).limit(pageSize))
         video_list = video_list.offset((page - 1) * pageSize).limit(pageSize).all()
         result = []
         # print(total_items,len(video_list),(page - 1) * pageSize,pageSize)
         for video_info in video_list:
-            video_code = video_info.video_code
+            video_code = video_info.gbIndexCode
             video_type_label='其他'
             longitude = 0
             latitude = 0
@@ -401,7 +401,7 @@ async def get_video_forest_fire_list(
             if video_type_li:
                 query = db.query(SysDictData)
                 query = query.filter(SysDictData.del_flag != '2')
-                query = query.filter(SysDictData.dict_type == 'video_type')
+                query = query.filter(SysDictData.dict_type == 'video_type_8')
                 query = query.filter(SysDictData.dict_value == video_type_li.dict_value).first()
                 if query:
                     video_type_label = query.dict_label
@@ -411,7 +411,7 @@ async def get_video_forest_fire_list(
                 longitude = video_base_info.longitude
                 latitude = video_base_info.latitude
                 area = video_base_info.area
-            result.append({"area":area,"status":video_info.status,"name":video_info.name,"video_code":video_info.video_code_int,"video_type_label":video_type_label,"longitude":longitude,"latitude":latitude})
+            result.append({"area":area,"status":video_info.status,"name":video_info.name,"video_code":video_code,"video_type_label":video_type_label,"longitude":longitude,"latitude":latitude})
 
 
         return {
@@ -440,23 +440,23 @@ async def get_video_forest_fire_list(
     try:
         video_type_list = ['sjyld','sgdfd','jtdd','dzzhyhd']
         # video_code_list = [item[0] for item in db.query(TpVideoTag.id).filter(TpVideoTag.dict_value == '4').all()]
-        video_list = db.query(TpVideoLog).filter(TpVideoLog.area=='茂名市视频数据共享管理平台/茂名市交通运输局')
+        video_list = db.query(TPVideoInfo).filter(TPVideoInfo.regionPath.like('@root00000000@44000000002160847111@%'))
 
         if 'query' in body:
             if 'id' in body['query']:
-                video_list = video_list.filter(TpVideoLog.video_code==body['query']['id'])
+                video_list = video_list.filter(TPVideoInfo.gbIndexCode==body['query']['id'])
         # 计算总条目数
         total_items = video_list.count()
         # 排序
 
-        video_list = video_list.order_by(TpVideoLog.video_code)
+        video_list = video_list.order_by(TPVideoInfo.gbIndexCode)
         # 执行分页查询
         # print(video_list.offset((page - 1) * pageSize).limit(pageSize))
         video_list = video_list.offset((page - 1) * pageSize).limit(pageSize).all()
         result = []
         # print(total_items,len(video_list),(page - 1) * pageSize,pageSize)
         for video_info in video_list:
-            video_code = video_info.video_code
+            video_code = video_info.gbIndexCode
             video_type_label='其他'
             longitude = 0
             latitude = 0
@@ -476,7 +476,7 @@ async def get_video_forest_fire_list(
                 longitude = video_base_info.longitude
                 latitude = video_base_info.latitude
                 area = video_base_info.area
-            result.append({"area":area,"status":video_info.status,"name":video_info.name,"video_code":video_info.video_code_int,"video_type_label":video_type_label,"longitude":longitude,"latitude":latitude})
+            result.append({"area":area,"status":video_info.status,"name":video_info.name,"video_code":video_info.gbIndexCode,"video_type_label":video_type_label,"longitude":longitude,"latitude":latitude})
 
 
         return {