cac
/
iec104
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

记录遥测数据

Browse Source
main
BlueMatthew 2 years ago
parent ffcb0b2b54
commit b950ea6aaf
7 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -93,6 +93,6 @@ vsproj/Debug
vsproj/Release vsproj/Release
vsproj/x64 vsproj/x64
log/ log/*
run/ run/
bin/ bin/

1
etc/ht_iec104.conf
Unescape Escape View File

@ -11,6 +11,7 @@ iec_site_id = 1
[COMM_SAVE_INTERNAL] [COMM_SAVE_INTERNAL]
DATA_SAVE_INTERNAL = 30 DATA_SAVE_INTERNAL = 30
ORIGIN_DATA_SAVE_INTERNAL = 3600
[IEC_OBJS_ADDR] [IEC_OBJS_ADDR]
iec_global_addr = 1 iec_global_addr = 1

1
include/HTHP104Table.h
Unescape Escape View File

@ -137,6 +137,7 @@ typedef struct _BREAK_EQM_CODE {
typedef struct _IEC104_CONF typedef struct _IEC104_CONF
{ {
unsigned int save_internal; // 104时间保存间隔时间(s) unsigned int save_internal; // 104时间保存间隔时间(s)
unsigned int orgin_data_save_internal; // 104原始数据保存时间(s)
unsigned int iec_byq_count; // 变压器数量 unsigned int iec_byq_count; // 变压器数量
unsigned int iec_break_count; // 断路器数量 unsigned int iec_break_count; // 断路器数量
unsigned char site_id[DEF_EQM_CODE_SIZE]; // 站点ID unsigned char site_id[DEF_EQM_CODE_SIZE]; // 站点ID

3
include/HTMemCacheData.h
Unescape Escape View File

@ -105,7 +105,8 @@ unsigned char cGetByqDeviceFaultState(unsigned char *pszEqm_code);
void SethDevTimeStat(unsigned char *sys_code, unsigned char ws); void SethDevTimeStat(unsigned char *sys_code, unsigned char ws);
time_t GetDevTimeStat(unsigned char *sys_code, unsigned char *ws); time_t GetDevTimeStat(unsigned char *sys_code, unsigned char *ws);
void ResetCachedDeviceData(); void ResetAllCachedDeviceData();
void ResetCachedDeviceData(CACHED_DEV_DATA& cachedDev);
std::string BuildSqlForDeviceData(CACHED_DEV_DATA& cachedDev); std::string BuildSqlForDeviceData(CACHED_DEV_DATA& cachedDev);
bool AssignValueToDeviceData(CACHED_DEV_DATA& cachedDev, const IEC_OBJVAL_NEW& val); bool AssignValueToDeviceData(CACHED_DEV_DATA& cachedDev, const IEC_OBJVAL_NEW& val);

53
src/HTIEC104.cpp
Unescape Escape View File

@ -184,6 +184,8 @@ static bool iGetIEC104Conf()
char szTmp[512], szSection[128]; char szTmp[512], szSection[128];
memset(&g_iec_conf, 0x00, sizeof(ST_IEC104_CONF)); // 初始化IEC104配置. memset(&g_iec_conf, 0x00, sizeof(ST_IEC104_CONF)); // 初始化IEC104配置.
g_iec_conf.orgin_data_save_internal = 3600;
// 打开配置文件,准备加载配置参数 // 打开配置文件,准备加载配置参数
if (fpIec == NULL) { if (fpIec == NULL) {
if ((fpIec = fopen(IEC_CONFIMG_FILE, "r")) == NULL) { if ((fpIec = fopen(IEC_CONFIMG_FILE, "r")) == NULL) {
@ -244,6 +246,15 @@ static bool iGetIEC104Conf()
} }
g_iec_conf.save_internal = (unsigned int)atoi(szTmp); g_iec_conf.save_internal = (unsigned int)atoi(szTmp);
// 104原始数据保存时间(s)
memset(szTmp, 0x00, sizeof(szTmp));
if ((iRet = iGetString("COMM_SAVE_INTERNAL", "ORIGIN_DATA_SAVE_INTERNAL", szTmp, sizeof(szTmp))) < 0) {
vPrtLogMsg(LOG_ERROR, iRet, "get DATA_SAVE_INTERNAL parameter failed!");
fclose(fpIec);
return false;
}
g_iec_conf.orgin_data_save_internal = (unsigned int)atoi(szTmp);
// 获取公共地址配置 // 获取公共地址配置
memset(szTmp, 0x00, sizeof(szTmp)); memset(szTmp, 0x00, sizeof(szTmp));
if ((iRet = iGetString("IEC_OBJS_ADDR", "iec_global_addr", szTmp, sizeof(szTmp))) < 0) { if ((iRet = iGetString("IEC_OBJS_ADDR", "iec_global_addr", szTmp, sizeof(szTmp))) < 0) {
@ -904,7 +915,7 @@ int SendMsgFormatU(int cmd)
iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&header, sizeof(ST_APCI)); iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&header, sizeof(ST_APCI));
if (iRet == ErrException) if (iRet == ErrException)
{ {
vPrtLogMsg(LOG_ERROR, iRet, "send mesg failed, sockid:%d msg:%s", g_IecCtrl.sockid, strerror(errno)); vPrtLogMsg(LOG_ERROR, iRet, "send mesg failed, sockid:%d msg:%s will close socket", g_IecCtrl.sockid, strerror(errno));
g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP); g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
@ -940,7 +951,7 @@ int SendMsgFormatS(unsigned short sendno)
if ((iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&header, sizeof(ST_APCI))) < 0) if ((iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&header, sizeof(ST_APCI))) < 0)
{ {
vPrtLogMsg(LOG_WARNG, iRet, "send Format S failed with error: %s, errno=%d", strerror(errno), errno); vPrtLogMsg(LOG_WARNG, iRet, "send Format S failed with error: %s, errno=%d will close socket", strerror(errno), errno);
g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP); g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
@ -972,7 +983,7 @@ int SendMsgFormatI(unsigned char *msgbuf, unsigned int len)
memcpy(buf + sizeof(ST_APCI), msgbuf, len); memcpy(buf + sizeof(ST_APCI), msgbuf, len);
if ((iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)buf, len + sizeof(ST_APCI))) < 0) if ((iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)buf, len + sizeof(ST_APCI))) < 0)
{ {
vPrtLogMsg(LOG_WARNG, iRet, "send Format I failed with error: %s, errno=%d", strerror(errno), errno); vPrtLogMsg(LOG_WARNG, iRet, "send Format I failed with error: %s, errno=%d will close socket", strerror(errno), errno);
g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP); g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
@ -1029,6 +1040,7 @@ void* thread_listen_proc(void * arg)
accept_fd = g_Tcp.tcpAcceptSocket(server_fd); accept_fd = g_Tcp.tcpAcceptSocket(server_fd);
if (accept_fd < 0) if (accept_fd < 0)
{ {
/*
mutex_lock(g_IecCtrl_mutex); mutex_lock(g_IecCtrl_mutex);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.last_time = 0; g_IecCtrl.last_time = 0;
@ -1036,10 +1048,18 @@ void* thread_listen_proc(void * arg)
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
mutex_unlock(g_IecCtrl_mutex); mutex_unlock(g_IecCtrl_mutex);
_SLEEP(1000); _SLEEP(1000);
*/
// vPrtLogMsg(LOG_DEBUG, errno,"slave link waitting connect...accept_fd=%d", accept_fd); // vPrtLogMsg(LOG_DEBUG, errno,"slave link waitting connect...accept_fd=%d", accept_fd);
continue; continue;
} }
mutex_lock(g_IecCtrl_mutex); mutex_lock(g_IecCtrl_mutex);
if (g_Tcp.tcpIsConnected(g_IecCtrl.sockid))
{
mutex_unlock(g_IecCtrl_mutex);
vPrtLogMsg(LOG_DEBUG, errno,"Previous link is connected, won't accept accept_fd=%d", accept_fd);
_SLEEP(1000);
continue;
}
g_IecCtrl.last_time = time(NULL); g_IecCtrl.last_time = time(NULL);
g_IecCtrl.last_yx_time = time(NULL); g_IecCtrl.last_yx_time = time(NULL);
g_IecCtrl.last_yc_time = time(NULL); g_IecCtrl.last_yc_time = time(NULL);
@ -1246,8 +1266,8 @@ void* thread_recv_proc(void * arg)
break; break;
} }
else if (recv_buflen <= 0) { else if (recv_buflen <= 0) {
vPrtLogMsg(LOG_WARNG, RET_OK,"socket link recv data length: %d,sockid=%d,errno=%d",recv_buflen,g_IecCtrl.sockid,errno); vPrtLogMsg(LOG_WARNG, RET_OK,"socket link recv data length: %d,sockid=%d,errno=%d, sleep and continue",recv_buflen,g_IecCtrl.sockid,errno);
//_SLEEP(g_TConfig.getTimeout1()); _SLEEP(1000);
continue; continue;
} }
@ -1458,12 +1478,14 @@ bool bSetPointTableValueYC(const std::vector<IEC_OBJVAL_NEW>& values)
{ {
sql = BuildSqlForDeviceData(itCachedDev->second); sql = BuildSqlForDeviceData(itCachedDev->second);
vPrtLogMsg(LOG_DEBUG, RET_OK, "Insert busi data %s", sql.c_str()); ResetCachedDeviceData(itCachedDev->second);
mutex_lock(g_list_busi_data_mutex); mutex_lock(g_list_busi_data_mutex);
itBusiData = g_list_busi_data.insert(g_list_busi_data.end(), std::string()); itBusiData = g_list_busi_data.insert(g_list_busi_data.end(), std::string());
itBusiData->swap(sql); itBusiData->swap(sql);
mutex_unlock(g_list_busi_data_mutex); mutex_unlock(g_list_busi_data_mutex);
vPrtLogMsg(LOG_DEBUG, 0, "Insert Busi Data into Table %s, sensor_id=%u", (const char*)itCachedDev->second.device->tableName, itCachedDev->second.device->sensor_id);
} }
} }
} }
@ -1775,17 +1797,17 @@ int DecodeMsgFormatI(unsigned char *msgbuf, unsigned int len, unsigned short sen
{ {
if (g_TConfig.shouldParseBusiData() != 0) if (g_TConfig.shouldParseBusiData() != 0)
{ {
ResetCachedDeviceData(); ResetAllCachedDeviceData();
} }
vPrtLogMsg(LOG_DEBUG, RET_OK, "Recv Activation Confirmation, %d.", msgbuf[9] - 20); vPrtLogMsg(LOG_DEBUG, RET_OK, "Recv Activation Confirmation, %d.", msgbuf[9] - 20);
} }
else if (cause == 10) // 激活结束 else if (cause == 10) // 激活结束
{ {
// SendMsgFormatS(sendno); // 总召唤结束发送S帧确认
if (g_TConfig.shouldParseBusiData() != 0) if (g_TConfig.shouldParseBusiData() != 0)
{ {
ResetCachedDeviceData(); ResetAllCachedDeviceData();
} }
//SendMsgFormatS(sendno); // 总召唤结束发送S帧确认
vPrtLogMsg(LOG_DEBUG, RET_OK, "Recv Activation Termination, %d", msgbuf[9] - 20); vPrtLogMsg(LOG_DEBUG, RET_OK, "Recv Activation Termination, %d", msgbuf[9] - 20);
} }
else else
@ -1828,7 +1850,7 @@ int SendMsgFormatIAction(unsigned char cmd)
iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&stPack, stPack.apci.len + 2); iRet = g_Tcp.tcpSendBuffer(g_IecCtrl.sockid, (const char*)&stPack, stPack.apci.len + 2);
if (iRet == ErrException) if (iRet == ErrException)
{ {
vPrtLogMsg(LOG_ERROR, iRet, "send mesg failed, sockid:%d msg:%s", g_IecCtrl.sockid, strerror(errno)); vPrtLogMsg(LOG_ERROR, iRet, "send mesg failed, sockid:%d msg:%s will close socket", g_IecCtrl.sockid, strerror(errno));
g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP); g_Tcp.clear_tcp_buffer(g_IecCtrl.sockid, MAX_SBUFF_TCP);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
@ -1852,6 +1874,7 @@ void DecodeMsgFormatU(ST_APCI *p)
SendMsgFormatU(CMD_TESTC); SendMsgFormatU(CMD_TESTC);
break; break;
case 0x08: // 启动确认位:=1 case 0x08: // 启动确认位:=1
vPrtLogMsg(LOG_DEBUG, RET_OK, "Send Activation");
SendMsgFormatIAction(CMD_CTL_64H); // 发送总召激活 SendMsgFormatIAction(CMD_CTL_64H); // 发送总召激活
break; break;
default: default:
@ -2111,13 +2134,12 @@ void * thread_origin_proc_new(void * arg)
pdbHandle->dbAutoCommit(pMySql, true); pdbHandle->dbAutoCommit(pMySql, true);
time_t now = time(NULL); time_t now = time(NULL);
if (now - g_IecCtrl.last_origin_time >= g_iec_conf.save_internal) // 超过设定保存时间间隔时 if (now - g_IecCtrl.last_origin_time >= g_iec_conf.orgin_data_save_internal) // 超过设定保存时间间隔时
{ {
g_IecCtrl.last_origin_time = now; g_IecCtrl.last_origin_time = now;
memset(szSql, 0x00, sizeof(szSql)); memset(szSql, 0x00, sizeof(szSql));
vTranHostTimeFmt(now, szWaringTime); vTranHostTimeFmt((now - g_iec_conf.orgin_data_save_internal), szWaringTime);
snprintf(szSql, sizeof(szSql), "DELETE FROM iec_origin_data_new WHERE d_time<'%s' ", snprintf(szSql, sizeof(szSql), "DELETE FROM niec_origin_data_new WHERE d_time<'%s' ", szWaringTime);
szWaringTime);
pdbHandle->AddInsertRecord(pMySql, szSql); pdbHandle->AddInsertRecord(pMySql, szSql);
} }
@ -3633,10 +3655,11 @@ void *thread_Timer_proc(void *arg)
{ {
if (g_IecCtrl.TxCounter - g_IecCtrl.LastAckTx > 6) if (g_IecCtrl.TxCounter - g_IecCtrl.LastAckTx > 6)
{ {
vPrtLogMsg(LOG_WARNG, 0, "Wait for U RESP timeout: TxCounter=%d LastAckTx=%d > 6, will close socket", g_IecCtrl.TxCounter, g_IecCtrl.LastAckTx);
g_Tcp.tcpCloseSocket(g_IecCtrl.sockid); g_Tcp.tcpCloseSocket(g_IecCtrl.sockid);
g_IecCtrl.isConnect = false; g_IecCtrl.isConnect = false;
vPrtLogMsg(LOG_DEBUG, 0, "Wait for U RESP timeout: TxCounter=%d LastAckTx=%d > 6, close the socket", g_IecCtrl.TxCounter, g_IecCtrl.LastAckTx);
} }
// g_IecCtrl.timer_Confirmflag = true; // g_IecCtrl.timer_Confirmflag = true;
} }

24
src/HTMemCacheData.cpp
Unescape Escape View File

@ -482,7 +482,7 @@ static void vLoadIECPointTableNew()
pdbHandle->FreeRecord(res); pdbHandle->FreeRecord(res);
} }
void ResetCachedDeviceData() void ResetAllCachedDeviceData()
{ {
map<unsigned int, CACHED_DEV_DATA>::iterator it; map<unsigned int, CACHED_DEV_DATA>::iterator it;
std::map<unsigned int, std::pair<IEC_FIELD, bool> >::iterator itField; std::map<unsigned int, std::pair<IEC_FIELD, bool> >::iterator itField;
@ -490,17 +490,29 @@ void ResetCachedDeviceData()
mutex_lock(g_map_iec_mutex_new); mutex_lock(g_map_iec_mutex_new);
for (it = g_map_dev_data.begin(); it != g_map_dev_data.end(); ++it) for (it = g_map_dev_data.begin(); it != g_map_dev_data.end(); ++it)
{ {
it->second.firstTs = 0; ResetCachedDeviceData(it->second);
it->second.assignedFields = 0; }
mutex_unlock(g_map_iec_mutex_new);
}
for (itField = it->second.fields.begin(); itField != it->second.fields.end(); ++itField) void ResetCachedDeviceData(CACHED_DEV_DATA& cachedDev)
{
if (cachedDev.assignedFields == 0)
{
return;
}
cachedDev.firstTs = 0;
std::map<unsigned int, std::pair<IEC_FIELD, bool> >::iterator itField;
for (itField = cachedDev.fields.begin(); itField != cachedDev.fields.end(); ++itField)
{ {
itField->second.first.ts = 0; itField->second.first.ts = 0;
itField->second.first.fval = 0.0; itField->second.first.fval = 0.0;
itField->second.second = false; itField->second.second = false;
} }
}
mutex_unlock(g_map_iec_mutex_new); cachedDev.assignedFields = 0;
} }
std::string BuildSqlForDeviceData(CACHED_DEV_DATA& cachedDev) std::string BuildSqlForDeviceData(CACHED_DEV_DATA& cachedDev)

13
src/HTTcpSocket.cpp
Unescape Escape View File

@ -56,13 +56,14 @@ int TTcpSocket::tcpGetSockID()
int TTcpSocket::tcpCloseSocket(int sockfd) int TTcpSocket::tcpCloseSocket(int sockfd)
{ {
if(sockfd > 0) { if(sockfd > 0) {
vPrtLogMsg(LOG_WARNG, RET_FAIL, "_close sockid=%d ", sockfd);
#ifdef _WIN32 #ifdef _WIN32
//if(_close(sockfd) == -1) //if(_close(sockfd) == -1)
if(shutdown(sockfd, 2) == -1) if(shutdown(sockfd, 2) == -1)
#else #else
if(close(sockfd) == -1) if(close(sockfd) == -1)
#endif #endif
// vPrtLogMsg(LOG_WARNG, RET_FAIL, "_close sockid=%d return:%d:%s",sockfd, errno, strerror(errno)); vPrtLogMsg(LOG_WARNG, RET_FAIL, "_close sockid=%d return:%d:%s",sockfd, errno, strerror(errno));
return 1; return 1;
} }
return 0 ; return 0 ;
@ -378,10 +379,14 @@ int TTcpSocket::tcpRecvBuffer(int sockid, char* pBuffer,int nMaxLength, int time
FD_SET((unsigned int)sockid, &fd_Read) ; FD_SET((unsigned int)sockid, &fd_Read) ;
FD_SET((unsigned int)sockid, &fd_Except) ; FD_SET((unsigned int)sockid, &fd_Except) ;
isel= select (sockid + 1 , &fd_Read, NULL, &fd_Except, &st_TimeOut) ; isel= select (sockid + 1 , &fd_Read, NULL, &fd_Except, &st_TimeOut) ;
if (isel == 0)
if(isel <= 0 || isel == EINTR) {
vPrtLogMsg(LOG_DEBUG, errno, "select socket timeout,isel=%d,timeout=%d continue", isel, timeout);
continue;
}
if(isel < 0 || isel == EINTR)
{ {
// vPrtLogMsg(LOG_DEBUG,errno, "select socket timeout,isel=%d",isel); vPrtLogMsg(LOG_DEBUG,errno, "select socket timeout,isel=%d,timeout=%d",isel, timeout);
break ; break ;
} }
else if( FD_ISSET(sockid, &fd_Except) ) else if( FD_ISSET(sockid, &fd_Except) )

Write Preview
Loading…
Cancel
Save