fix real power2023-6-15

unify_api/modules/electric/dao/electric_dao.py

 from pot_libs.mysql_util.mysql_util import MysqlUtil
+from pot_libs.settings import SETTING
 
 
 async def monitor_point_join_by_points(points):
@@ -71,3 +72,14 @@ async def get_elec_mtid_sid_by_cid(cid):
     async with MysqlUtil() as conn:
         datas = await conn.fetchall(sql, args=(cid_tuple,))
     return datas if datas else []
+
+
+async def load_add_to_compy_ids(cid):
+    db = SETTING.mysql_db
+    sql = f"SELECT monitor.mtid, monitor.sid FROM {db}.monitor " \
+          f"INNER JOIN {db}.point ON point.mtid=monitor.mtid " \
+          f"WHERE monitor.cid=%s AND point.add_to_company=1 " \
+          f"AND monitor.demolished=0;"
+    async with MysqlUtil() as conn:
+        ids = await conn.fetchall(sql, (cid,))
+        return ids if ids else []

unify_api/modules/home_page/procedures/count_info_pds.py

@@ -4,8 +4,7 @@ from datetime import datetime, timedelta
 import pendulum
 
 from pot_libs.settings import SETTING
-from unify_api.modules.electric.dao.electric_dao import \
-    get_elec_mtid_sid_by_cid
+from unify_api.modules.electric.dao.electric_dao import load_add_to_compy_ids
 from unify_api.utils.common_utils import round_2
 from pot_libs.aredis_util.aredis_utils import RedisUtils
 from pot_libs.logger import log
@@ -34,6 +33,7 @@ from unify_api.modules.electric_optimization.dao.power_index import (
 )
 from unify_api.utils.taos_new import parse_td_columns, get_td_table_name, \
     td3_tbl_compate, get_td_engine_data
+from unify_api.utils.time_format import CST
 
 
 async def other_info(cid):
@@ -205,34 +205,25 @@ async def normal_rate_of_location(cid):
 
 async def real_time_load(cid, end_dt=None):
     """实时负荷"""
-    datas = await get_elec_mtid_sid_by_cid(cid)
-    td_mt_tables = tuple(
-        (get_td_table_name("electric", data["mtid"]) for data in datas if
-         data["mtid"]))
-    td_mt_tables = td3_tbl_compate(td_mt_tables)
+    td_tbls = []
+    for item in await load_add_to_compy_ids(cid):
+        mtid, sid = item["mtid"], item["sid"]
+        tbl = get_td_table_name("electric", mtid)
+        td_tbls.append(tbl)
+        td_tbls.append(f"s_{sid.lower()}_e")
+
+    td_mt_tables = td3_tbl_compate(td_tbls)
     if not end_dt:
-        end_dt = pendulum.now(tz="Asia/Shanghai")
-    start_dt = end_dt.subtract(minutes=2)
-
-    sql = f"select last_row(mdptime, pttl) from electric_stb " \
-          f"where TBNAME IN {td_mt_tables} and ts>='{str(start_dt)}' and ts " \
-          f"<='{str(end_dt)}' group by tbname"
-
+        end_dt = pendulum.now(tz=CST)
+    s_dt = end_dt.subtract(minutes=15)
+    sql = f"SELECT last_row(mdptime, pttl) FROM electric_stb " \
+          f"WHERE TBNAME IN {td_mt_tables} " \
+          f"AND ts>='{str(s_dt)}' AND ts <='{str(end_dt)}' group by tbname;"
     url = f"{SETTING.stb_url}db_electric?tz=Asia/Shanghai"
     is_succ, results = await get_td_engine_data(url, sql)
     if not is_succ:
         return ""
 
-    if not results["data"]:  # 兼容：mt表（2.0架构）里面拿不到数据再从sid表（1.0架构）里面拿
-        td_s_tables = tuple(
-            (f"s{data['sid'].lower()}_e" for data in datas if data["sid"]))
-        td_s_tables = td3_tbl_compate(td_s_tables)
-        sql = f"select last_row(mdptime, pttl) from electric_stb " \
-              f"where TBNAME IN {td_s_tables} group by tbname"
-        is_succ, results = await get_td_engine_data(url, sql)
-        if not is_succ:
-            return ""
-
     head = parse_td_columns(results)
     datas = []
     for res in results["data"]: