sjzd
/
SLVService
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change files to compile the slvser successfully for temp

Browse Source
temp
CentOS 7.9 64Bits 1 year ago
parent 0c7fb03b2e
commit de846636b4
9 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
include/HTConst.h
Unescape Escape View File

@ -37,6 +37,10 @@
#define MAX_PATH 260
#endif
#ifndef _MAX_DIR
#define _MAX_DIR 256
#endif
// use buffer size define
#define DEF_BUFFER_32 32
#define DEF_BUFFER_64 64

2
include/HTDataStruct.h
Unescape Escape View File

@ -171,7 +171,7 @@ typedef struct {
time_t iLastTime; // 最近一次链接时间
time_t iLastActionTime;// 最近一次活动时间
time_t iLastAlaarmTime; // 最近一次链接告警时间
IedModel *IedModel; // Ä£Ð;ä±ú
IedModel *tIedModel; // Ä£Ð;ä±ú
}ST_IED_CONN_HANDLE;
// iec61850 录播文件属性定义

2
include/HTLogger.h
Unescape Escape View File

@ -39,7 +39,7 @@ extern "C" {
#ifdef LOG_DEBUG
#undef LOG_DEBUG
#endif
#define __LOG_DEBUG 0 // 跟踪日志
#define __LOG_DEBUG 1 // 跟踪日志
#define LOG_DEBUG __LINE__, _FILE_, __LOG_DEBUG
#ifdef LOG_WARNG

12
src/HTBusiDatabase.cpp
Unescape Escape View File

@ -545,7 +545,7 @@ void vSetIedDevicesWarnMesg(char *Ied_ip, int port, time_t altime)
return;
}
vTranHostTimeFmt(altime, szTime);
_snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,load_type,warn_desc,warn_level,state) "
snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,load_type,warn_desc,warn_level,state) "
"VALUES(guuid(), '%s', '%s','1', '1','%s:%d,Ied链接异常断开,请检查!', '0','1')",
"", szTime, Ied_ip, port);
vPrtLogMsg(LOG_DEBUG, RET_OK, "insert Warning: %s", szSql);
@ -563,7 +563,7 @@ void vDelIedDevicesWarnMesg(char *Ied_ip, int port, time_t altime)
return;
}
vTranHostTimeFmt(altime, szTime);
_snprintf(szSql, sizeof(szSql), "update busi_warning set process='network check', process_time=sysdate(),"
snprintf(szSql, sizeof(szSql), "update busi_warning set process='network check', process_time=sysdate(),"
"process_user='system' where warn_type='1' and warn_level='0' and state = '1' and warn_time='%s' "
"warn_desc = '%s:%d,Ied链接异常断开,请检查!' ", szTime, Ied_ip, port);
vPrtLogMsg(LOG_DEBUG, RET_OK, "update Warning: %s", szSql);
@ -585,7 +585,7 @@ void vSetRealDevicesMoniMesg(ST_DB_BODY *pData)
vTranHostTimeFmt(pData->dtime, szTime);
// 1:振动装置 2 : 噪声装置 3 : 中心点装置
if (pData->szDevType == 1) {
_snprintf(szSql, sizeof(szSql), "insert into busi_ampli_real(id, file_id,main_id,sub_id,side,phase,in_out,"
snprintf(szSql, sizeof(szSql), "insert into busi_ampli_real(id, file_id,main_id,sub_id,side,phase,in_out,"
"frequency,max_amplitude,ins_time) "
"values(guuid(), '%s', '%s', '%s', '%c', '%c', '%c', '%s', '%.4f', '%s') ",
pData->file_id, pData->m_id, pData->s_id, pData->side, pData->phase, pData->in_out,
@ -593,12 +593,12 @@ void vSetRealDevicesMoniMesg(ST_DB_BODY *pData)
vPrtLogMsg(LOG_DEBUG, RET_OK, "insert busi_ampli_real: %s", szSql);
}
else if (pData->szDevType == 2) {
_snprintf(szSql, sizeof(szSql), "insert into busi_noise_real(id, main_id,max_amplitude,ins_time) "
snprintf(szSql, sizeof(szSql), "insert into busi_noise_real(id, main_id,max_amplitude,ins_time) "
"values(guuid(), '%s','%.4f', '%s') ",
pData->m_id, pData->value, szTime);
}
else if (pData->szDevType == 3) {
_snprintf(szSql, sizeof(szSql), "insert into busi_center_real(id, main_id,max_amplitude,ins_time) "
snprintf(szSql, sizeof(szSql), "insert into busi_center_real(id, main_id,max_amplitude,ins_time) "
"values(guuid(), '%s','%.4f', '%s') ",
pData->m_id, pData->value, szTime);
}
@ -617,7 +617,7 @@ void vSetRealDevicesWarnMesg(ST_DB_WARN &stWarn)
return;
}
vTranHostTimeFmt(stWarn.almtime, szTime);
_snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,warn_desc,warn_level,state,sample_value,value_unit) "
snprintf(szSql, sizeof(szSql), "INSERT INTO busi_warning(id,sub_id,warn_time,warn_type,warn_desc,warn_level,state,sample_value,value_unit) "
"VALUES(guuid(), '%s', '%s','%d', '%s', '%d','%d','%.4f','%s')",
"", stWarn.s_id, szTime, stWarn.warn_type, stWarn.szDesc,stWarn.level,stWarn.state,stWarn.value,stWarn.valunit);
vPrtLogMsg(LOG_DEBUG, RET_OK, "insert Warning: %s", szSql);

16
src/HTIEC61850.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ IedModel *LoadModelConfigFile(char *icd_file)
// }
// pNodeSpl = pNodeSpl->sibling;
//}
printf_s("Node:%s\n", szNodeStr.c_str());
printf("Node:%s\n", szNodeStr.c_str());
printf((const char*)"Node: %s\n", szNodeStr.c_str());
printf("Node: %s\n", szSipl.c_str());
}//IedModel_getModelNodeByObjectReference(model, iedModel_MONT);
@ -319,8 +319,8 @@ void setComtradeFile(IedConnection con, const char *filename)
char szFileName[MAX_PATH] = { 0 };
char szRemotePath[260];
char* dirc = _strdup(filename);
char* basec = _strdup(filename);
char* dirc =strdup(filename);
char* basec = strdup(filename);
char* localDirName = getDirName(dirc, szDirName);
char* localFileName = getBaseName(basec, szFileName);
@ -383,7 +383,7 @@ void getComtradeFile(IedConnection con)
vPrtLogMsg(LOG_DEBUG, 0, "getComtradeFiles file_count= %d", g_list_comtrad_files.size());
memcpy(&stFiles, &(*ptr), sizeof(ST_FILES_ATTRIB));
char* bname = _strdup((const char*)stFiles.szFileName);
char* bname = strdup((const char*)stFiles.szFileName);
char* localFilename = getBaseName(bname, szLocalFile);
strcpy(szFilePath, g_TConfig.getComtradePath());
strcat(szFilePath, "/");
@ -649,10 +649,10 @@ void vIedFreeIedEvent(ST_IED_CONN_HANDLE &stIedHandle)
IedConnection_destroy(stIedHandle.hConnHandle);
}
stIedHandle.hConnHandle = NULL;
if (stIedHandle.IedModel) {
IedModel_destroy(stIedHandle.IedModel);
if (stIedHandle.tIedModel) {
IedModel_destroy(stIedHandle.tIedModel);
}
stIedHandle.IedModel = NULL;
stIedHandle.tIedModel = NULL;
}
// 根据icd节点名称，获取传感器绑定关系
@ -1211,4 +1211,4 @@ void vGetDataSetList(IedConnection conn)
ClientReportControlBlock_destroy(rcb);
#endif
}
}

6
src/HTIEC61850Thread.cpp
Unescape Escape View File

@ -129,9 +129,9 @@ void *thread_iec61850_manager_proc(void *arg)
mutex_unlock(g_MapIedConn_mutex);
}
mutex_lock(g_MapIedConn_mutex);
if (!(*m_pIter).second.IedModel) {
(*m_pIter).second.IedModel = LoadModelConfigFile(g_TConfig.getIEDModelConfigFile());
if ((*m_pIter).second.IedModel == NULL) {
if (!(*m_pIter).second.tIedModel) {
(*m_pIter).second.tIedModel = LoadModelConfigFile(g_TConfig.getIEDModelConfigFile());
if ((*m_pIter).second.tIedModel == NULL) {
vPrtLogMsg(LOG_ERROR, 0, "Load model config failed,model_file=%s", g_TConfig.getIEDModelConfigFile());
mutex_unlock(g_MapIedConn_mutex);
return NULL;

1
src/HTMmslite.cpp
Unescape Escape View File

@ -13,6 +13,7 @@
****************************************************************************/
#include "HTGlobal.h"
#include "HTMmsMapping.h"
#include "mms/mmslite/glbtypes.h"
static const char *_FILE_ = "HTMmslite.cpp";

10
src/HTSLVService.cpp
Unescape Escape View File

@ -29,10 +29,10 @@ static void cancel_thread_work(void)
}
vPrtLogMsg(LOG_DEBUG, RET_OK, "thread_handle_modbus_recv shutdown.");
if (thread_handle_iec61850_recv) {
pthread_cancel(thread_handle_iec61850_recv);
pthread_join(thread_handle_iec61850_recv, NULL);
pthread_kill(thread_handle_iec61850_recv, SIGURG);
if (thread_handle_iec61850_manager_proc) {
pthread_cancel(thread_handle_iec61850_manager_proc);
pthread_join(thread_handle_iec61850_manager_proc, NULL);
pthread_kill(thread_handle_iec61850_manager_proc, SIGURG);
}
vPrtLogMsg(LOG_DEBUG, RET_OK, "thread_handle_iec61850_recv shutdown.");
@ -167,7 +167,7 @@ static void task_kill()
int main(int argc, char* argv[])
{
printf("单位:[%s]\n", "mm/s²");
printf_s("单位:[%s]\n", "mm/s²");
printf("单位:[%s]\n", "mm/s²");
cout << "单位:" << "mm / s²" << endl;
if (argc != 2) {

15
src/makefile
Unescape Escape View File

@ -9,14 +9,14 @@
CC = g++
MYSQL_PATH = /usr/local/mysql-5.5.43
MYSQL_LIB_FILE = mysqlclient
MYSQL_PATH = /usr/include/mysql
MYSQL_LIB_FILE = /usr/lib64/mysql
#CFLAGS = -c -Werror -g -D_REENTRANT -Wformat -Wsign-compare -O3 -ansi
CFLAGS = -c -Werror -g -Dlinux -D_DEBUG -D_REENTRANT -DDEBUG_SISCO -DMOSI -DLEAN_T -DTP0_ENABLED -DMMS_LITE -DMVL_UCA -Wformat -Wsign-compare -O3 -ansi
LIBS = -L$(MYSQL_PATH)/lib -l$(MYSQL_LIB_FILE) `pkg-config --libs libmodbus` -lnsl -luuid -lpthread -lm -lc -l../libs/cosmos_ld -lstdc++
CFLAGS = -c -g -Dlinux -D_DEBUG -D_REENTRANT -DDEBUG_SISCO -DMOSI -DLEAN_T -DTP0_ENABLED -DMMS_LITE -DMVL_UCA -Wformat -Wsign-compare -O3 -ansi #-fpermissive
LIBS = -L$(MYSQL_PATH)/lib -L$(MYSQL_LIB_FILE) -L../libs `pkg-config --libs libmodbus`-lmysqlclient -lnsl -luuid -lpthread -lm -lc -lstdc++ -liec61850
INCPATH = -I../include -I../include/sntp -I../include/sisco -I$(MYSQL_PATH)/include `pkg-config --cflags libmodbus`
INCPATH = -I../include -I../include/sntp -I../include/sisco -I$(MYSQL_PATH) `pkg-config --cflags libmodbus` -I../libiec61850-1.4.2.1/include -I../scl_tool
# global file
OBJS_PATH = ../obj
@ -26,9 +26,8 @@ OBJS = $(OBJS_PATH)/HTSLVService.o $(OBJS_PATH)/HTGlobal.o \
$(OBJS_PATH)/HTDatabase.o $(OBJS_PATH)/HTStrConvert.o \
$(OBJS_PATH)/HTConfig.o $(OBJS_PATH)/HTUnit.o \
$(OBJS_PATH)/HTXmlMethod.o $(OBJS_PATH)/HTModbus.o \
$(OBJS_PATH)/HTMmslite.o $(OBJS_PATH)/HTBusiDatabase.o \
$(OBJS_PATH)/HTTcpSocket.o $(OBJS_PATH)/HTNtptime.o \
$(OBJS_PATH)/HTSntpc.o $(OBJS_PATH)/HTSntpd.o
$(OBJS_PATH)/HTBusiDatabase.o $(OBJS_PATH)/HTTcpSocket.o \
$(OBJS_PATH)/HTIEC61850.o $(OBJS_PATH)/HTIEC61850Thread.o
TARGET = ../bin/slvser

Write Preview
Loading…
Cancel
Save