Merge branch 'master' of https://gogs.tjp.com.cn/maoming/python-fastapi-mm-zhcs-yj-api

routers/api/dataFilling/__init__.py

@@ -235,8 +235,8 @@ class ReportQuery(BaseModel):
     issued_status: Optional[str] = Field(None, description="Issued status filter (comma-separated values, e.g., '0,1')")
     page: int = Field(1, gt=0, description="Page number for pagination")
     pageSize: int = Field(10, gt=0, description="Page size for pagination")
-
-@router.post("/select")
+@router.post('/select')
+#@router.get("/select")
 async def select_report(
     db: Session = Depends(get_db),
     query: ReportQuery = Body(..., description="Report query parameters in the request body"),
@@ -715,7 +715,7 @@ def has_matching_column_comments(
 
 
 @router.post("/reports_by_creator")
-#@router.get("/reports_by_creator")
+@router.get("/reports_by_creator")
 async def get_reports_by_creator(
     field_comment: Optional[str] = Query(None, description="Optional comment of the field to match"),
     page: int = Query(default=1, gt=0),  # 分页参数：当前页码，默认为1
@@ -883,4 +883,4 @@ async def get_records_by_creator_and_report(
         "end_time": end_time_str,
         "columns": columns_info,
         "rows": rows_data
-    }
+    }

routers/api/videoResource/videoinfo.py

@@ -162,21 +162,21 @@ async def get_video_forest_fire_list(
         # 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()]
         # sql = '''SELECT * FROM tp_video_log T1 LEFT JOIN (SELECT indexcode,longitude,latitude FROM `tp_video_base`where latitude>0) T2 on T1.video_code_int=T2.indexcode where 1=1 '''
-        sql = '''SELECT T1.`name`,T1.`status`,T1.`video_code_int`as `video_code`,IFNULL(IFNULL(T3.longitude,T2.longitude),0) as longitude,IFNULL(IFNULL(T3.latitude,T2.latitude),0) as latitude,CASE 
+        sql = '''SELECT T1.`name`,IF(T1.`status`='在线',1,0) as `status`,T1.`video_code_int`as `video_code`,IFNULL(IFNULL(T3.longitude,T2.longitude),0) as longitude,IFNULL(IFNULL(T3.latitude,T2.latitude),0) as latitude,CASE 
             WHEN IFNULL(T3.area,T1.area) like '%高州%' THEN
-                '高州市'
+                '440981'
             WHEN IFNULL(T3.area,T1.area) like '%信宜%' THEN
-                '信宜市'
+                '440983'
             WHEN IFNULL(T3.area,T1.area) like '%化州%' THEN
-                '化州市'
+                '440982'
             WHEN IFNULL(T3.area,T1.area) like '%茂南%' THEN
-                '茂南区'
+                '440902'
             WHEN IFNULL(T3.area,T1.area) like '%电白%' THEN
-                '电白区'
+                '440904'
             ELSE
-                '直辖市'
+                '440900'
         END 
-         as area  FROM tp_video_log T1 LEFT JOIN (SELECT indexcode,longitude,latitude FROM `tp_video_base`where latitude>0) T2 on T1.video_code_int=T2.indexcode  LEFT JOIN tp_video_log_transportation_area_info T3 on T1.video_code_int=T3.video_code where 1=1 '''
+         as area  FROM tp_video_log T1 LEFT JOIN (SELECT indexcode,longitude,latitude FROM `tp_video_base`where latitude>0) T2 on T1.video_code_int=T2.indexcode  LEFT JOIN tp_video_log_transportation_area_info T3 on T1.video_code_int=T3.video_code where 1=1  and T2.longitude>0 '''
         # video_list = db.query(TpVideoLog,TpVideoBase.longitude,TpVideoBase.latitude).join(
         #                             TpVideoBase,
         #                             TpVideoBase.indexcode == TpVideoLog.video_code,isouter=True