fix anshiu read tdengine 2023-7-31

unify_api/modules/anshiu/dao/fine_monitor_dao.py

@@ -8,24 +8,20 @@ from pot_libs.mysql_util.mysql_util import MysqlUtil
 async def get_aiao_1min_dao(mtid, start_time, end_time):
     # 查1min温度漏电流
     sid_data = await get_sid_by_mtid_dao(mtid)
-    sid = sid_data['sid'].lower()
-    su_table = "new_adio_stb"
-    td_mt_table = get_td_table_name(su_table, mtid)
+    sid_lower = sid_data["sid"].lower()
+    td_mt_table = get_td_table_name("adio", mtid)
     url = f"{SETTING.stb_url}db_adio"
-    # td的精度过高，采用 >= start  and < end的形式查询
-
-    sql = f"select last_row( ts, temp1, temp2, temp3, temp4, residual_current) " \
-          f"from adio_stb  where TBNAME = '{td_mt_table}'  and " \
+    sql = f"select ts, temp1, temp2, temp3, temp4, residual_current " \
+          f"from db_adio.{td_mt_table}  WHERE " \
           f"ts >= '{start_time}' AND ts <'{end_time}' " \
-          f"Interval(60s) order by ts asc"
+          f"order by ts asc"
     is_succ, results = await get_td_engine_data(url, sql)
     if not results:
-        su_table = "old_adio_stb"
-        td_mt_table = get_td_table_name(su_table, sid)
-        sql = f"select last_row( ts, temp1, temp2, temp3, temp4, residual_current) " \
-              f"from adio_stb  where TBNAME = '{td_mt_table}'  and " \
+        td_mt_table = f"s_{sid_lower}_a"
+        sql = f"select ts, temp1, temp2, temp3, temp4, residual_current " \
+              f"from db_adio.{td_mt_table}  WHERE " \
               f"ts >= '{start_time}' AND ts <'{end_time}' " \
-              f"Interval(60s) order by ts asc"
+              f"order by ts asc"
         is_succ, results = await get_td_engine_data(url, sql)
     if not is_succ:
         raise BusinessException()
@@ -112,24 +108,21 @@ async def get_point_1min_chart_dao(mtid, ctnum, start_time, end_time):
         ]
     # 查1min温度漏电流
     sid_data = await get_sid_by_mtid_dao(mtid)
-    sid = sid_data['sid'].lower()
-    su_table = "new_electric_stb"
-    td_mt_table = get_td_table_name(su_table, mtid)
+    sid_lower = sid_data["sid"].lower()
+    td_mt_table = get_td_table_name("electric", mtid)
     url = f"{SETTING.stb_url}db_electric"
     # td的精度过高，采用 >= start  and < end的形式查询
     stats_items.insert(0, 'ts')
-    sql = f"select last_row({','.join(stats_items)}) " \
-          f"from electric_stb  where TBNAME = '{td_mt_table}'  and " \
+    sql = f"select {','.join(stats_items)} " \
+          f"from db_electric.{td_mt_table} WHERE " \
           f"ts >= '{start_time}' AND ts <'{end_time}' " \
-          f"Interval(60s) order by ts asc"
+          f"order by ts asc"
     is_succ, results = await get_td_engine_data(url, sql)
     if not results:
-        su_table = "old_electric_stb"
-        td_mt_table = get_td_table_name(su_table, sid)
-        sql = f"select last_row( {','.join(stats_items)}) " \
-              f"from electric_stb  where TBNAME = '{td_mt_table}'  and " \
+        sql = f"select {','.join(stats_items)} " \
+              f"from db_electric.s_{sid_lower}_e  WHERE  " \
               f"ts >= '{start_time}' AND ts <'{end_time}' " \
-              f"Interval(60s) order by ts asc"
+              f"order by ts asc"
         is_succ, results = await get_td_engine_data(url, sql)
     if not is_succ:
         raise BusinessException()