lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix qvvr time and fix fluc error

Browse Source
This commit is contained in:
lnk
2025-07-29 18:10:03 +08:00
parent 46b7603ed0
commit cc41842077
4 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mms/mms_process.c
View File

@@ -1898,7 +1898,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
if (ret2==SD_SUCCESS && ret3==SD_SUCCESS ) { //两个文件都写好了
//mq日志
DIY_INFOLOG(full_key_m_c,"【NORMAL】监测点:%s - id:%s从终端获取录波文件成功,开始上传录波文件到web并更新暂态事件", LD_info->name,LD_info->mp_id);
DIY_INFOLOG(full_key_m_c,"【NORMAL】监测点:%s - id:%s从终端获取录波文件成功", LD_info->name,LD_info->mp_id);
QVVR_t *qvvr; //暂态事件
long long start_tm,trig_tm,end_tm;
@@ -1906,6 +1906,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
ret2 = extract_timestamp_from_cfg_file(filenames[cfg_idx],&start_tm,&trig_tm);//提取文件的开始时间和触发时间
printf(">>>>>>>> extract_timestamp_from_cfg_file end \n");
if (ret2 ==APR_SUCCESS) {
DIY_INFOLOG(full_key_m_c,"【NORMAL】监测点:%s - id:%s提取录波文件时间成功", LD_info->name,LD_info->mp_id);
//to find the paired qvvr by the time of trig_tm
printf(">>>>>>>> extract_timestamp_from_cfg_file success \n");
qvvr = find_qvvr_by_trig_tm(LD_info,trig_tm); //根据文件的触发时间查找检测点记录的匹配上的暂态事件
@@ -2019,7 +2020,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
}
if(strcmp(cfg1.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京
utc_or_beijing = 28800000;
utc_or_beijing = 0;//61850库已经转换过
}
else{
utc_or_beijing = 0;
@@ -2116,9 +2117,15 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
free(wavepath_dat);
}
}
}
else
{
DIY_ERRORLOG(full_key_m_c,"【NORMAL】监测点:%s - id:%s匹配录波文件失败，请检查装置的暂态时间是秒还是毫秒，并修改映射文件", LD_info->name,LD_info->mp_id);
}
}
}
}
else {
if (ied && chnl_usr){

2
mms/rdb_ext_utils.c
View File

@@ -553,7 +553,7 @@ void processQVVR_end(LD_info_t* LD_info)
}
if(strcmp(cfg.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京
utc_or_beijing = 28800000;
utc_or_beijing = 0;//61850库已经转换过了，八小时毫秒数28800000;
}
else{
utc_or_beijing = 0;