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

fix ledger update

Browse Source
This commit is contained in:
lnk
2025-08-20 20:32:17 +08:00
parent 78f95f2c96
commit e2ee8546c7
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mms/mms_process.c
View File

@@ -321,13 +321,13 @@ void ChannelCheckIECReports(chnl_usr_t *chnl_usr)
LD_info->registcount++;
if (LD_info->registcount <= 5) {
DIY_ERRORLOG_CODE(full_key_m_c,LOG_CODE_REPORT,"【ERROR】监测点:%s - id:%s补招数据失败,监测点缺少报告控制块,请检查装置对应的装置类型是否有配对的icd模型", LD_info->name,LD_info->mp_id);
DIY_ERRORLOG_CODE(full_key_m_c,LOG_CODE_REPORT,"【ERROR】监测点:%s - id:%s报告触发失败,监测点逻辑标识号为0,请检查装置对应的台账信息是否正确", LD_info->name,LD_info->mp_id);
}
// 到5次就不再打印，并标记
if (LD_info->registcount > 5) {
LD_info->has_logged_regist = true;
DIY_WARNLOG_CODE(full_key_m_c,LOG_CODE_REPORT,"【WARN】监测点:%s - id:%s缺少报告控制块日志已达本次记录上限，不再输出，请检查装置对应的装置类型是否有配对的icd模型",
DIY_WARNLOG_CODE(full_key_m_c,LOG_CODE_REPORT,"【WARN】监测点:%s - id:%s监测点逻辑标识号错误日志已达本次记录上限，不再输出，请检查装置对应的台账信息是否正确",
LD_info->name, LD_info->mp_id);
}
}
@@ -1638,7 +1638,15 @@ void CheckNextNotConnectedChannel()
chnl_usr->m_reqCtrl = NULL;
chnl_usr->net_info->rem_vmd = NULL;
chnl_usr->m_state = CHANNEL_DISCONNECTED;
chnl_usr->m_ClosedMsTime = sGetMsTime();
chnl_usr->m_ClosedMsTime = sGetMsTime();
//断联成功
apr_time_t t_now = apr_time_now();
connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(t_now),0);
//更新状态
chnl_usr->chnl->ied->status = STATUS_OVERTIME;
chnl_usr->chnl->status = STATUS_OVERTIME;
}
}
else
@@ -1673,6 +1681,14 @@ void CheckNextNotConnectedChannel()
chnl_usr->m_state = CHANNEL_DISCONNECTED;
chnl_usr->m_ClosedMsTime = sGetMsTime();
//断联
apr_time_t t_now = apr_time_now();
connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(t_now),0);
//更新状态
chnl_usr->chnl->ied->status = STATUS_OVERTIME;
chnl_usr->chnl->status = STATUS_OVERTIME;
}
}
}
@@ -1740,6 +1756,9 @@ void CheckNextNotConnectedChannel()
ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext;
apr_time_t t_now = apr_time_now();
connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(t_now),0);
//更新状态
chnl_usr->chnl->ied->status = STATUS_BREAKOFF;
chnl_usr->chnl->status = STATUS_BREAKOFF;
//mq日志
DIY_WARNLOG_CODE(full_key_t_c,LOG_CODE_COMM,"【WARN】终端%s - ip端口:%s:%d 断连完成，关闭连接通道", ((ied_usr_t*)(chnl_usr->chnl->ied->usr_ext))->terminal_id,chnl_usr->ip_str,chnl_usr->chnl->port);
@@ -1767,6 +1786,9 @@ void CheckNextNotConnectedChannel()
ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext;
apr_time_t t_now = apr_time_now();
connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(t_now),0);
//更新状态
chnl_usr->chnl->ied->status = STATUS_BREAKOFF;
chnl_usr->chnl->status = STATUS_BREAKOFF;
//mq日志
DIY_WARNLOG_CODE(full_key_t_c,LOG_CODE_COMM,"【WARN】终端%s - ip端口:%s:%d 断连未完成,但是已经超时180秒,关闭连接通道", ((ied_usr_t*)(chnl_usr->chnl->ied->usr_ext))->terminal_id,chnl_usr->ip_str,chnl_usr->chnl->port);
@@ -1969,7 +1991,7 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
//WW 2023-11-01 end
if (ret2 !=APR_SUCCESS){
//mq日志
DIY_WARNLOG_CODE(full_key_m_c,LOG_CODE_COMTRADE_FILE,"【WARN】监测点:%s - id:%s前置记录的录波事件上传的录波号段%d与从装置获取的录波文件列表匹配失败,装置没有对应的号段的录波文件，前置清除这个录波号段", LD_info->name,LD_info->mp_id,LD_info->FltNum[i]);
DIY_WARNLOG_CODE(full_key_m_c,LOG_CODE_COMTRADE_FILE,"【WARN】监测点:%s - id:%s前置记录的录波事件上传的录波号段%d与从装置获取的录波文件列表匹配失败,装置没有对应的号段的录波文件，清除该记录", LD_info->name,LD_info->mp_id,LD_info->FltNum[i]);
//lnk20250819装置没有对应的文件时清除录波号段
LD_info->FltNum[i] = -1;
return ret2;