diff --git a/apps/enm/services.py b/apps/enm/services.py index 2e998886..b6567cd0 100644 --- a/apps/enm/services.py +++ b/apps/enm/services.py @@ -249,8 +249,8 @@ def insert_mplogx_from_king_mqtt(data: dict, is_offset=True): # num_chunks = (len(objs) + chunk_size - 1) // chunk_size otime_obj = timezone.make_aware(datetime.strptime(pvs["2"], "%Y-%m-%d %H:%M:%S.%f")).replace(microsecond=0) # 只保留到秒级的精度 - - insert_mplogx_from_king_mqtt_chunk(objs, otime_obj, is_offset) + oval = pvs["1"] + insert_mplogx_from_king_mqtt_chunk(objs, oval, otime_obj, is_offset) # with concurrent.futures.ThreadPoolExecutor(max_workers=4) as executor: # futures = [] # for i in range(num_chunks): @@ -263,7 +263,7 @@ def insert_mplogx_from_king_mqtt(data: dict, is_offset=True): # print(future.result(), end=', ') -def insert_mplogx_from_king_mqtt_chunk(objs: list, otime_obj: datetime, is_offset=True): +def insert_mplogx_from_king_mqtt_chunk(objs: list, oval, otime_obj: datetime, is_offset=True): """ 分批存库, 亚控 38.00,00000.11011 版本偏移只是时间戳偏移。另外其实可以不在乎 """ @@ -271,7 +271,7 @@ def insert_mplogx_from_king_mqtt_chunk(objs: list, otime_obj: datetime, is_offse enp_mpoints_dict = {} # 这个地方主要是需要更新envdata表里的数据 for obj in objs: n = obj["N"] - val = obj["1"] + val = obj.get("1", oval) # timex = obj.get("2", None) code = f"K_{n}" cache_key = Mpoint.cache_key(code)