fix query_points_by_storey 2023-7-7

unify_api/modules/alarm_manager/service/alarm_static_service.py

@@ -140,7 +140,7 @@ async def sdu_app_statistics_sort_service(cid, start, end):
 async def sdu_electric_behave_service(cid, start, end, storeys, product):
     """近30天用电行为"""
     # 1.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     # 获取point_id列表
     points = [i.get("point_id") for i in point_list]
     # 2. es查询违规/大功率/正常次数

unify_api/modules/alarm_manager/service/list_alarm_service.py

@@ -18,7 +18,7 @@ async def new_list_alarm_service(cid, storeys, offset, page_size, start, end,
                                  importance, points, product):
     """报警信息分页列表"""
     # 1.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     if not point_list:
         return ListAlarmResponse(total=0, rows=[])
     # point_id和storey对应关系

unify_api/modules/common/dao/common_dao.py

@@ -33,15 +33,15 @@ async def storey_by_cid(cid):
     return storey_list
 
 
-async def query_points_by_storey(storeys):
+async def query_points_by_storey(cid, storeys):
     """根据storey_id查询point_id和room_name"""
     sql = "SELECT s.storey_id,s.storey_name,s.point_id,s.room_name,m.mtid," \
           "p.ctnum,p.cid from storey_room_map s LEFT JOIN point p " \
           "on p.pid=s.point_id LEFT JOIN monitor m on m.mtid=p.mtid " \
-          "where s.storey_id in %s and m.demolished=0 " \
+          "where s.storey_id in %s and s.cid=%s and m.demolished=0 " \
           "order by s.storey_id, s.room_name"
     async with MysqlUtil() as conn:
-        points = await conn.fetchall(sql, args=(tuple(storeys),))
+        points = await conn.fetchall(sql, args=(tuple(storeys), cid))
     return points
 
 

unify_api/modules/common/procedures/points.py

@@ -102,7 +102,7 @@ async def point_to_mid(points):
     return point_mid, len(point_mid)
 
 
-async def points_by_storeys(storeys):
+async def points_by_storeys(cid, storeys):
     """根据storey_id查询point_id和room_name"""
-    point_list = await query_points_by_storey(storeys)
+    point_list = await query_points_by_storey(cid, storeys)
     return point_list

unify_api/modules/elec_charge/service/elec_charge_service.py

@@ -15,7 +15,7 @@ from unify_api.utils.common_utils import round_2, division_two
 async def kwh_points_service(cid, start, end, storeys):
     """获取points电量"""
     # 1.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     # 获取point_id列表
     points = [i.get("point_id") for i in point_list]
     # 2. es查询数据

unify_api/modules/elec_charge/views/elec_charge.py

@@ -410,7 +410,7 @@ async def get_kwh_points_download(req):
     start = args.get("start")
     end = args.get("end")
     # 2.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     # 获取point_id列表
     points = [i.get("point_id") for i in point_list]
     # 3. es查询数据

unify_api/modules/electric/service/electric_service.py

@@ -28,10 +28,10 @@ from unify_api.modules.electric.components.electric import (
 )
 
 
-async def elec_current_storeys_service(storeys):
+async def elec_current_storeys_service(cid, storeys):
     """用电监测-实时监测-楼层"""
     # 1.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     mtids = [i.get("mtid") for i in point_list]
     d_rt_ele = await batch_load_rt_ele(mtids)
     elec_data = {}
@@ -95,10 +95,10 @@ async def elec_current_storeys_service(storeys):
     return EscResp(elec_data=elec_list)
 
 
-async def qual_current_storeys_service(storeys):
+async def qual_current_storeys_service(cid, storeys):
     """电能质量-实时参数-楼层"""
     # 1.根据storeys获取points信息
-    point_list = await points_by_storeys(storeys)
+    point_list = await points_by_storeys(cid, storeys)
     mtids = [point["mtid"] for point in point_list if point["mtid"]]
     d_rt_ele = await batch_load_rt_ele_with_hr(mtids)
     # 4. 返回数据

unify_api/modules/electric/views/electric.py

@@ -411,14 +411,14 @@ async def post_qual_current(req, body: PageRequest) -> QualCurrentResponse:
 
 @summary("用电监测-实时监测-楼层")
 async def post_elec_current_storeys(req, body: EcsReq) -> EscResp:
-    storeys = body.storeys
-    return await elec_current_storeys_service(storeys)
+    cid, storeys = body.cid, body.storeys
+    return await elec_current_storeys_service(cid, storeys)
 
 
 @summary("电能质量-实时参数-楼层")
 async def post_qual_current_storeys(req, body: EcsReq) -> QcsResp:
-    storeys = body.storeys
-    return await qual_current_storeys_service(storeys)
+    cid, storeys = body.cid, body.storeys
+    return await qual_current_storeys_service(cid, storeys)
 
 
 @summary("用电监测-卡片信息-level")