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

fix connect info

Browse Source
This commit is contained in:
lnk
2025-03-12 11:45:53 +08:00
parent d1242aae7a
commit 4e860b9ffb
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
json/create_json.cpp
View File

@@ -4003,8 +4003,19 @@ void connectlog_pgsql(char* id,char* datetime,int status)
//std::cout << "jsonString: " << jsonString << std::endl;////<2F><><EFBFBD>ٶ<EFBFBD><D9B6><EFBFBD><EFBFBD>Ĵ<EFBFBD>ӡ //std::cout << "jsonString: " << jsonString << std::endl;////<2F><><EFBFBD>ٶ<EFBFBD><D9B6><EFBFBD><EFBFBD>Ĵ<EFBFBD>ӡ
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD>Զ<EFBFBD><D4B6> //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD>Զ<EFBFBD><D4B6>
//SendJsonAPI_web(WEB_COMFLAG, "", jsonString,&ptr);//<2F><>ʹ<EFBFBD>ýӿ<C3BD>lnk20250310
/*SendJsonAPI_web(WEB_COMFLAG, "", jsonString,&ptr);//<2F><>ʹ<EFBFBD>ýӿ<C3BD>lnk20250310
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD><D8B5><EFBFBD><EFBFBD><EFBFBD>
// <20><><EFBFBD><EFBFBD> ptr <20>Ƿ<EFBFBD>Ϊ NULL<4C><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD> std::string <20><>ʼ<EFBFBD><CABC>ʧ<EFBFBD><CAA7>
if (ptr != NULL) {
//handleCommentResponse(std::string(ptr));//<2F><><EFBFBD>ٶ<EFBFBD><D9B6><EFBFBD><EFBFBD>Ĵ<EFBFBD>ӡ
free(ptr); // <20><><EFBFBD><EFBFBD> SendJsonAPI_web <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ棬<DAB4>ǵ<EFBFBD><C7B5>ͷ<EFBFBD>
} else {
// <20><><EFBFBD><EFBFBD> ptr Ϊ NULL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::cout << "Error: Received NULL response" << std::endl;
}*/
//ʹ<><CAB9>mq //ʹ<><CAB9>mq
Ckafka_data_t connect_info; Ckafka_data_t connect_info;
connect_info.strTopic = QString::fromStdString(G_CONNECT_TOPIC); connect_info.strTopic = QString::fromStdString(G_CONNECT_TOPIC);
@@ -4016,20 +4027,6 @@ void connectlog_pgsql(char* id,char* datetime,int status)
kafka_data_list_mutex.unlock(); //<2F><><EFBFBD><EFBFBD> kafka_data_list_mutex.unlock(); //<2F><><EFBFBD><EFBFBD>
} }
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD><D8B5><EFBFBD><EFBFBD><EFBFBD>
// <20><><EFBFBD><EFBFBD> ptr <20>Ƿ<EFBFBD>Ϊ NULL<4C><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD> std::string <20><>ʼ<EFBFBD><CABC>ʧ<EFBFBD><CAA7>
if (ptr != NULL) {
//handleCommentResponse(std::string(ptr));//<2F><><EFBFBD>ٶ<EFBFBD><D9B6><EFBFBD><EFBFBD>Ĵ<EFBFBD>ӡ
free(ptr); // <20><><EFBFBD><EFBFBD> SendJsonAPI_web <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ棬<DAB4>ǵ<EFBFBD><C7B5>ͷ<EFBFBD>
} else {
// <20><><EFBFBD><EFBFBD> ptr Ϊ NULL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::cout << "Error: Received NULL response" << std::endl;
}
// ת<><D7AA>Ϊ QString
QString result = QString::fromStdString(jsonString);
// <20>ͷ<EFBFBD><CDB7>ڴ<EFBFBD> // <20>ͷ<EFBFBD><CDB7>ڴ<EFBFBD>
cJSON_Delete(jsonObject); cJSON_Delete(jsonObject);
free(jsonString); // cJSON_PrintUnformattedʹ<64><CAB9>malloc<6F><63><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD> free(jsonString); // cJSON_PrintUnformattedʹ<64><CAB9>malloc<6F><63><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD>

48
mms/mms_process.c
View File

@@ -28,7 +28,7 @@ void clear_rpt_counter_by_trigger(trigger_t *trigger);
//lnk20241031 //lnk20241031
extern void SOEFileWeb(char* localpath,char* cloudpath,char* wavepath); extern void SOEFileWeb(char* localpath,char* cloudpath,char* wavepath);
//lnk 2024-11-4 <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //lnk 2024-11-4 <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
char* convertMsToDateTimeString(int msTime); char* convertMsToDateTimeString(int64_t msTime);
//lnk20250115 //lnk20250115
extern pthread_mutex_t mtx; extern pthread_mutex_t mtx;
extern apr_pool_t* g_cfg_pool; extern apr_pool_t* g_cfg_pool;
@@ -1617,7 +1617,9 @@ void CheckNextNotConnectedChannel()
//lnk202411-1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӳɹ<D3B3><C9B9>ļ<EFBFBD>¼ //lnk202411-1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӳɹ<D3B3><C9B9>ļ<EFBFBD>¼
ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext; ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext;
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),1);//1<>ɹ<EFBFBD> apr_time_t t_now = apr_time_now();
printf("msTime:%ld",t_now);
connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(t_now),1);//1<>ɹ<EFBFBD>
} }
else else
@@ -1630,7 +1632,7 @@ void CheckNextNotConnectedChannel()
//lnk202411-4 //lnk202411-4
//connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7> //connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>
//printf("check error89 !!!!!!!!!!!!!!\n"); //printf("check error89 !!!!!!!!!!!!!!\n");
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),0);//0ʧ<30><CAA7> //connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(sGetMsTime()),0);//0ʧ<30><CAA7>
//printf("check error88 !!!!!!!!!!!!!!\n"); //printf("check error88 !!!!!!!!!!!!!!\n");
} }
printf( "reqCtrl->result == FAIL, Since StartConnecting %i sec ,channel IP %s:%d \n",secsSince,chnl_usr->ip_str,chnl_usr->chnl->port); printf( "reqCtrl->result == FAIL, Since StartConnecting %i sec ,channel IP %s:%d \n",secsSince,chnl_usr->ip_str,chnl_usr->chnl->port);
@@ -1650,7 +1652,7 @@ void CheckNextNotConnectedChannel()
if (g_node_id == STAT_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID) { if (g_node_id == STAT_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID) {
//connectlog_pgsql(ied_usr->terminal_code);//reqCtrl->doneδ<65><CEB4><EFBFBD>ɣ<EFBFBD><C9A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ5<CAB1><35><EFBFBD><EFBFBD> //connectlog_pgsql(ied_usr->terminal_code);//reqCtrl->doneδ<65><CEB4><EFBFBD>ɣ<EFBFBD><C9A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ5<CAB1><35><EFBFBD><EFBFBD>
//lnk202411-4 //lnk202411-4
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),0);//0ʧ<30><CAA7> //connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(sGetMsTime()),0);//0ʧ<30><CAA7>
} }
//cout<<pChannel->GetIP()<<" reqCtrl->done == SD_false but time over 300 secs, close channel !!!"<<endl; //cout<<pChannel->GetIP()<<" reqCtrl->done == SD_false but time over 300 secs, close channel !!!"<<endl;
echo_warn2( "reqCtrl->doneδ<65><CEB4><EFBFBD><EFBFBD>,but time over 300 secs, close channel IP %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info); echo_warn2( "reqCtrl->doneδ<65><CEB4><EFBFBD><EFBFBD>,but time over 300 secs, close channel IP %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info);
@@ -1711,8 +1713,8 @@ void CheckNextNotConnectedChannel()
//RDB_SetIedChnlStatus(chnl_usr->chnl->ied, STATUS_NOINIT, chnl_usr->chnl_id); //RDB_SetIedChnlStatus(chnl_usr->chnl->ied, STATUS_NOINIT, chnl_usr->chnl_id);
//write_status_to_db(0,chnl_usr->chnl->addr); //write_status_to_db(0,chnl_usr->chnl->addr);
//lnk202411-1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ӳɹ<D3B3><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵļ<EFBFBD>¼ //lnk202411-1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӣ<EFBFBD><D3A3><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>ӳɹ<D3B3>
//connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),1);//1<>ɹ<EFBFBD> //connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(sGetMsTime()),1);
} }
else else
@@ -1725,7 +1727,7 @@ void CheckNextNotConnectedChannel()
//connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7> //connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//printf("check error96 !!!!!!!!!!!!!!\n"); //printf("check error96 !!!!!!!!!!!!!!\n");
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),0);//0ʧ<30><CAA7> //connectlog_pgsql(ied_usr->terminal_id,convertMsToDateTimeString(sGetMsTime()),0);//<2F><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>״̬û<CCAC>иı䲻<C4B1><E4B2BB>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>20250312
//printf("check error95 !!!!!!!!!!!!!!\n"); //printf("check error95 !!!!!!!!!!!!!!\n");
} }
echo_warn3("FAILED: mms_connectToServer IP %s:%d ,NetInfo= %x \n", chnl_usr->ip_str, chnl_usr->chnl->port, chnl_usr->net_info); echo_warn3("FAILED: mms_connectToServer IP %s:%d ,NetInfo= %x \n", chnl_usr->ip_str, chnl_usr->chnl->port, chnl_usr->net_info);
@@ -1751,7 +1753,12 @@ void CheckNextNotConnectedChannel()
chnl_usr->m_reqCtrl = NULL; chnl_usr->m_reqCtrl = NULL;
chnl_usr->net_info = NULL; chnl_usr->net_info = NULL;
chnl_usr->m_state = CHANNEL_DISCONNECTED; chnl_usr->m_state = CHANNEL_DISCONNECTED;
chnl_usr->m_ClosedMsTime = sGetMsTime(); chnl_usr->m_ClosedMsTime = sGetMsTime();
//<2F><><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>
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);
} }
else else
{// {//
@@ -1772,6 +1779,10 @@ void CheckNextNotConnectedChannel()
chnl_usr->net_info = NULL; chnl_usr->net_info = NULL;
chnl_usr->m_state = CHANNEL_DISCONNECTED; chnl_usr->m_state = CHANNEL_DISCONNECTED;
chnl_usr->m_ClosedMsTime = sGetMsTime(); chnl_usr->m_ClosedMsTime = sGetMsTime();
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD>
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);
} }
} }
}//if(pChannel->m_state == CHANNEL_DISCONNECTING) }//if(pChannel->m_state == CHANNEL_DISCONNECTING)
@@ -2135,16 +2146,23 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
} }
//lnk 2024-11-4 <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //lnk 2024-11-4 <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
char* convertMsToDateTimeString(int msTime) { char* convertMsToDateTimeString(int64_t usTime) {
// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> // ȷ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><EFBFBD>
time_t seconds = msTime / 1000; if (usTime < 0) {
return "Invalid timestamp";
}
// <20><>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD> // <20><> `apr_time_t` ΢<>루us<75><73>ת<EFBFBD><D7AA>Ϊ `time_t` <20>루s<EFBFBD><EFBFBD>
struct tm* timeInfo = localtime(&seconds); time_t seconds = usTime / 1000000;
// <20><> `struct tm` <20><><EFBFBD><EFBFBD><EFBFBD>洢ʱ<E6B4A2><CAB1>
struct tm timeInfo;
// **ʹ<><CAB9> `localtime_r()` <20><><EFBFBD><EFBFBD>ϵͳʱ<CDB3><CAB1>**
localtime_r(&seconds, &timeInfo);
// <20><>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>洢ת<E6B4A2><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD> // <20><>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>洢ת<E6B4A2><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>
static char buffer[20]; static char buffer[30];
strftime(buffer, sizeof(buffer), "%y-%m-%d %H:%M:%S", timeInfo); strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &timeInfo);
return buffer; return buffer;
} }