change hr realtime data redis cache time to 360s 2024-07-23

unify_api/constants.py

@@ -50,6 +50,7 @@ VOLTAGE_STANDARD = 220  # 系统额定电压
 FREQ_STANDARD = 50  # 系统额定频率
 
 REAL_EXP_TIME = 120  # 实时数据，timestamp在4小时内判断
+REAL_HR_EXP_TIME = 360  # 谐波实时数据，timestamp在6分钟内判断
 PTTL_REAL_EXP_TIME = 120  # 负荷实时数据，timestamp在2分钟内判断
 
 # 电量电费index

unify_api/modules/electric/service/electric_service.py

@@ -19,7 +19,7 @@ from unify_api.utils.common_utils import round_2, round_4, multiplication_two
 from unify_api.modules.electric.procedures.electric_util import \
     load_point_ctnum
 from datetime import datetime
-from unify_api.constants import REAL_EXP_TIME
+from unify_api.constants import REAL_EXP_TIME, REAL_HR_EXP_TIME
 from unify_api.utils.time_format import CST, YMD_Hms, timestamp2dts
 from unify_api.modules.common.procedures.location_temp_rcurrent import \
     location_stats_statics
@@ -525,7 +525,7 @@ async def elec_current_service(point_id):
         if rt_ele and rt_ele_hr:
             rt_ele, rt_ele_hr = json.loads(rt_ele), json.loads(rt_ele_hr)
             if now_ts - rt_ele["ts"] <= REAL_EXP_TIME:
-                if now_ts - rt_ele_hr["ts"] <= REAL_EXP_TIME:
+                if now_ts - rt_ele_hr["ts"] <= REAL_HR_EXP_TIME:
                     for k in rt_ele_hr.keys():
                         if k not in rt_ele.keys():
                             rt_ele[k] = rt_ele_hr[k]