diff --git a/src/HTIEC61850.cpp b/src/HTIEC61850.cpp index 3cb0ef1..8d9e9fa 100644 --- a/src/HTIEC61850.cpp +++ b/src/HTIEC61850.cpp @@ -478,7 +478,7 @@ void vDownLoadComtradeFiles(ST_IED_CONN_HANDLE &stIedCon) memcpy(&stFiles, &(g_list_comtrad_files.back()), sizeof(ST_FILES_ATTRIB)); // 由尾取出 g_list_comtrad_files.pop_back(); // 由尾删除 mutex_unlock(g_list_comtrad_files_mutex); - //unPackComtradeFile(stFiles.szFileName); // 解析文件并入库 + unPackComtradeFile(stFiles.szFileName); // 解析文件并入库 by rensichao } printf("file download and parser complate....\n"); @@ -807,6 +807,7 @@ void Add_SetList(ST_DB_BODY *pData, ST_DEVICE_INFO *pstBase) memcpy(&stSetData, pData, sizeof(ST_DB_BODY)); strcpy(stSetData.m_id, pstBase->szMID); + strcpy(stSetData.s_id, pstBase->szSID); stSetData.in_out = pstBase->cInOut; stSetData.phase = pstBase->cPhase; stSetData.side = pstBase->cSide; @@ -898,6 +899,7 @@ void vGetFCMXData_YC(IedConnection conn) continue; // 取振幅值 } stBody.value = stIedVal.MX_f; + stBody.dtime = time(NULL); vPrtLogMsg(LOG_WARNG, 0, "rensichao read add list [%d] \n", stBody.value); if(false==bGetDeviceBindRelationship(stBind.nodename, stBody, stBase)) continue; vPrtLogMsg(LOG_WARNG, 0, "rensichao read add list midddle[%d] \n", stBody.value); diff --git a/src/HTIEC61850Thread.cpp b/src/HTIEC61850Thread.cpp index 560de95..a787ea6 100644 --- a/src/HTIEC61850Thread.cpp +++ b/src/HTIEC61850Thread.cpp @@ -76,7 +76,7 @@ void *thread_iec61850_client_proc(void *arg) vGetFCMXData_YC(stIedConn.hConnHandle); // ��ȡң������-���ֵ //vGetFCMXData_YX(stIedConn.hConnHandle); // ��ȡң������-�澯λ - //vDownLoadComtradeFiles(stIedConn); // ����¼���ļ� + vDownLoadComtradeFiles(stIedConn); // ����¼���ļ� _SLEEP(1000 * 60); vPrtLogMsg(LOG_DEBUG, 0, "Get once monitor data complate..."); }