250325-2代码。

routers/api/spatialAnalysis/point.py

@@ -127,7 +127,7 @@ async def get_details(
         infos = get_points(db,option,latitude_min,latitude_max,longitude_min,longitude_max)
         return {"code": 200,
                 "msg": "操作成功",
-                "data": {"videos":videos,"points":infos}}
+                "data": videos+infos }#{"videos":videos,"points":infos}}
     except Exception as e:
         # 处理异常
         traceback.print_exc()

routers/api/videoResource/tag/__init__.py

@@ -82,7 +82,9 @@ async def get_dict_data_by_type(
         query = query.filter(SysDictData.del_flag != '2')
         query = query.order_by(SysDictData.dict_sort)
         # dict_data = db.query(SysDictData).filter_by(dict_type==dict_type and del_flag != '2').all()
+        total_items = query.count()
         dict_data = query.offset((page - 1) * pageSize).limit(pageSize).all()
+
         # 将模型转换为字典
         dict_data_list = [
             {
@@ -104,7 +106,11 @@ async def get_dict_data_by_type(
         result = {
             "code": 200,
             "msg": "操作成功",
-            "data": dict_data_list
+            "data": dict_data_list,
+            "total": total_items,
+            "page": page,
+            "pageSize": pageSize,
+            "totalPages": (total_items + pageSize - 1) // pageSize
         }
         return result
     except Exception as e: