增加保护

main
BlueMatthew 2 years ago
parent 244c3fdfa4
commit 39d97f4021

@ -866,14 +866,14 @@ static void addOriginDataList(ST_IECPOINT_TABLE &stData)
// 添加原始数据入库队列 // 添加原始数据入库队列
static void addOriginDataListNew(const IEC_OBJVAL_NEW &stData) static void addOriginDataListNew(const IEC_OBJVAL_NEW &stData)
{ {
int i = 0; // int i = 0;
IEC_OBJVAL_NEW stSetData; // IEC_OBJVAL_NEW stSetData;
memset(&stSetData, 0x00, sizeof(IEC_OBJVAL_NEW)); // memset(&stSetData, 0x00, sizeof(IEC_OBJVAL_NEW));
memcpy(&stSetData, &stData, sizeof(IEC_OBJVAL_NEW)); // memcpy(&stSetData, &stData, sizeof(IEC_OBJVAL_NEW));
mutex_lock(g_list_origin_mutex_new); mutex_lock(g_list_origin_mutex_new);
g_list_origin_new.push_front(stSetData); g_list_origin_new.push_front(stData);
mutex_unlock(g_list_origin_mutex_new); mutex_unlock(g_list_origin_mutex_new);
} }
@ -1502,6 +1502,8 @@ bool bSetPointTableValueYC(const std::vector<IEC_OBJVAL_NEW>& values)
} }
mutex_unlock(g_map_iec_mutex_new); mutex_unlock(g_map_iec_mutex_new);
if (!tableName.empty())
{
// Assume they belongs the same object // Assume they belongs the same object
std::string sql = "INSERT INTO "; std::string sql = "INSERT INTO ";
sql.append(tableName); sql.append(tableName);
@ -1532,6 +1534,7 @@ bool bSetPointTableValueYC(const std::vector<IEC_OBJVAL_NEW>& values)
it = g_list_busi_data.insert(g_list_busi_data.end(), std::string()); it = g_list_busi_data.insert(g_list_busi_data.end(), std::string());
it->swap(sql); it->swap(sql);
mutex_unlock(g_list_busi_data_mutex); mutex_unlock(g_list_busi_data_mutex);
}
/* /*
IEC_OBJVAL_NEW objVal = { 0 }; IEC_OBJVAL_NEW objVal = { 0 };

Loading…
Cancel
Save