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

routers/api/videoResource/wrjvideo.py

@@ -14,6 +14,7 @@ from fastapi.responses import JSONResponse
 import traceback
 from datetime import datetime
 from common import WRJApi
+from config import settings
 
 router = APIRouter()
 
@@ -71,7 +72,7 @@ async def roughTimeStatus(
                 continue
 
             # "convertCode": null, // // 第三方机库的状态 0-离线、1-待命中、2-飞行中、3-管制中、4-维护中、5-执行任务
-            if str(n['convertCode']) not in status_list:
+            if status != '' and str(n['convertCode']) not in status_list:
                 continue
 
             n['status_text'] = convertDict[str(n['convertCode'])]
@@ -87,15 +88,32 @@ async def roughTimeStatus(
                 "fly_url": n['mediaPullStreamAddress'] if n['mediaPullStreamAddress'] is not None else "", # 飞机视频流
                 "nest_url": n['nestOutMediaPullStreamAddress'] if n['nestOutMediaPullStreamAddress'] is not None else "", # 机巢视频流
             }
+
+            # 测试数据
+            if n['id'] == '1725080256731168770' and settings.IS_PROD == False:
+                item['status'] = 2
+                item['status_text'] = '飞行中'
+                item['fly_info'] =  {
+                    "lng": '111.58967074364558', # 当前经度（WGS84）
+                    "lat": '21.5870035628497', # 当前纬度（WGS84）
+                    "windSpeed": '3.0', # 无人机当前接触到的风速（米/ 秒）
+                    "nestSeed": '1.1', # 当前机库所在地风速
+                    "temperature": '34.099998474121094', # 无人机目前舱内温度
+                    "environmentTemperature": '30.4', # 无人机所在地的环境温度
+                    "batteryPerce": '66.0', # 电池电量（%）
+                    "rainFall": '0' # 无人机所在地天气情况 0：无雨 1： 小雨 2： 中雨 3： 大雨
+                }
+
+            
             
             # 飞行中的附加信息
-            if str(n['convertCode']) == '1':
+            if str(n['convertCode']) == '2':
                 fly_info = get_fly_info(n['id'], fly_data)
+                print('fly_info:', fly_info)
                 if fly_info is not None:
                    item['fly_info'] =  fly_info
             wrj_list.append(item)
 
-        print(wrj_list)
         
         return {
             "code": 200,
@@ -116,19 +134,19 @@ def get_fly_info(id: str, data: list):
     for n in data:
         if n['id'] == id:
             return {
-                "lng": n['lng'],
-                "lat": n['lat'],
-                "windSpeed": n['windSpeed'],
-                "nestSeed": n['nestSpeed'],
-                "temperature": n['temperature'],
-                "environmentTemperature": n['environmentTemperature'],
-                "batteryPerce": n['batteryPerce'],
-                "rainFall": n['rainFall']
+                "lng": str(n['lng']),
+                "lat": str(n['lat']),
+                "windSpeed": str(n['windSpeed']),
+                "nestSeed": str(n['nestSpeed']),
+                "temperature": str(n['temperature']),
+                "environmentTemperature": str(n['environmentTemperature']),
+                "batteryPerce": str(n['batteryPerce']),
+                "rainFall": str(n['rainFall'])
             }
     
     return None
 
-    
+'''    
 # 获取飞行中无人机清单
 @router.get('/flyUavInfo')
 async def flyUavInfo(
@@ -244,5 +262,5 @@ async def getRealInfo(
         return {
             "code": 500,
             "msg": "操作失败"
-        }
-    
+        }'
+'''