From f2bec8c94e9ab4c8d3e0b0df174e2b40417d795f Mon Sep 17 00:00:00 2001 From: lnk Date: Wed, 12 Mar 2025 14:33:55 +0800 Subject: [PATCH] fix connect info and soe --- json/create_json.cpp | 2 +- mms/mms_process.c | 2 +- mms/rdb_ext_utils.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/json/create_json.cpp b/json/create_json.cpp index 2372097..8dba3f0 100644 --- a/json/create_json.cpp +++ b/json/create_json.cpp @@ -3976,7 +3976,7 @@ void connectlog_pgsql(char* id,char* datetime,int status) cJSON_Delete(jsonObject); return; } - cJSON_AddItemToObject(jsonObject, "Datetime", datetime_item); + cJSON_AddItemToObject(jsonObject, "date", datetime_item); char statusStr[12]; // 足够容纳一个整数（包括负号和 '\0'） sprintf(statusStr, "%d", status);// 使用 sprintf 将 int 转换为字符串 diff --git a/mms/mms_process.c b/mms/mms_process.c index 782065a..4f1cb98 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -1496,7 +1496,7 @@ void CheckAllConnectedChannel() ChannelCheckWaveFiles(chnl_usr);//录波文件 if(g_node_id == HIS_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID || g_node_id == RECALL_HIS_DATA_BASE_NODE_ID || (g_node_id == RECALL_ALL_DATA_BASE_NODE_ID)) ChannelCheckIECLogs(chnl_usr);//补招文件 - if ( (sGetMsTime() - chnl_usr->m_LastPosRespTime) > 15*1000 ) //wait 15 secs + if ( (sGetMsTime() - chnl_usr->m_LastPosRespTime) > 15*1000 ) //wait 15 secs，隔15秒获取一次响应，两次没响应后关闭 { char** varnames ; int varnum; diff --git a/mms/rdb_ext_utils.c b/mms/rdb_ext_utils.c index b38ad31..5c5d6fe 100644 --- a/mms/rdb_ext_utils.c +++ b/mms/rdb_ext_utils.c @@ -536,8 +536,13 @@ void processQVVR_end(LD_info_t* LD_info) continue; //添加时间判断lnk20250311 - if (LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time >110) + if (fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 + - LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime) > 1.0){ + printf("~~~~~~~fail in pair qvvr node %f~~~~~~~~~~ \n",fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 + - LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime)); continue; + } + //其他某位置的波动也没有定义类型/这个位置的波动类型和当前位置的波动类型一致，暂降事件一次会发三个报告,启动和上值和结束