Merge branch 'wwr' into 'develop'

map_index

See merge request !20

unify_api/modules/home_page/views/count_info.py

@@ -210,7 +210,8 @@ async def post_info_yang_chen(req, body: CountInfoReq) -> IycResp:
     # 1. 获取cid
     cid = body.cid
     # return await info_yang_chen_service(cid)
-    return IycResp() # 扬尘接口，返回空数据
+    return IycResp(total_point=20, air_quality=10, safe_operation_days=11,
+                   total_water=132.80, total_kwh=0) # 扬尘接口，返回空数据
 
 @summary("工厂版首页地图信息-扬尘")
 async def post_info_yang_chen_map(req, body: CountInfoReq) -> IycmResp:

unify_api/modules/tsp_water/views/tsp.py

@@ -21,7 +21,10 @@ async def post_tsp_history(req, body: ThReq) -> ThResp:
     start = body.start
     end = body.end
     # return await tsp_history_service(tsp_id, start, end)
-    return ThResp()
+    return ThResp(pm2_5={}, pm10={}, tsp={}, time_slots=[], pm2_5_predict={},
+                  pm10_contrast={}, tsp_predict={}, pm2_5_contrast={},
+                  pm10_predict={})
+
 
 @summary("TSP信息-指标统计")
 async def post_tsp_index_statistics(req, body: TisReq) -> TisResp:
@@ -30,7 +33,8 @@ async def post_tsp_index_statistics(req, body: TisReq) -> TisResp:
     end = body.end
     # return await tsp_index_statistics_service(tsp_id, start, end)
     # return await tsp_index_statistics_service_new15(tsp_id, start, end)
-    return TisResp()
+    return TisResp(pm2_5={}, pm10={}, tsp={})
+
 
 @summary("当日环境")
 async def post_day_env(req, body: DeReq) -> DeResp:
@@ -45,7 +49,10 @@ async def post_stat_analysis(req, body: ThReq) -> SaResp:
     start = body.start
     end = body.end
     # return await stat_analysis_service(cid, tsp_id, start, end)
-    return SaResp()
+    return SaResp(pm2_5=[], pm10=[], tsp=[], water=[], fog_gun=[],
+                  time_slots=[], r_water_pm25={}, r_water_pm10={},
+                  r_water_tsp={}, r_gun_pm25={}, r_gun_pm10={}, r_gun_tsp={})
+
 
 @summary("TSP信息-预测偏差")
 async def post_tsp_predict_deviation(req, body: TisReq) -> TpdResp:
@@ -53,7 +60,8 @@ async def post_tsp_predict_deviation(req, body: TisReq) -> TpdResp:
     start = body.start
     end = body.end
     # return await tsp_predict_deviation_service(tsp_id, start, end)
-    return TpdResp()
+    return TpdResp(pm2_5={}, pm10={}, tsp={})
+
 
 @summary("TSP信息-对比偏差")
 async def post_tsp_contrast_deviation(req, body: TisReq) -> TcdResp:
@@ -63,6 +71,7 @@ async def post_tsp_contrast_deviation(req, body: TisReq) -> TcdResp:
     # return await tsp_contrast_deviation_service(tsp_id, start, end)
     return TcdResp()
 
+
 @summary("统计分析-扬尘-描述")
 async def post_analysis_describe(req, body: AdReq) -> AdResp:
     cid = body.cid