|
@@ -267,7 +267,7 @@ void event_list::load_his_data_from_db()
|
|
AND cur_time < NOW()\
|
|
AND cur_time < NOW()\
|
|
GROUP BY event_type_id, obj_id,dis_type) \
|
|
GROUP BY event_type_id, obj_id,dis_type) \
|
|
AND event_id NOT IN ( SELECT event_id FROM his_event_data WHERE stat=100)\
|
|
AND event_id NOT IN ( SELECT event_id FROM his_event_data WHERE stat=100)\
|
|
- AND event_type_id NOT IN (21,22);";
|
|
|
|
|
|
+ AND event_type_id NOT IN (21,22,31,36);";
|
|
std::string Error;
|
|
std::string Error;
|
|
YADB::CDBResultSet DBRes;
|
|
YADB::CDBResultSet DBRes;
|
|
sDBConnPool.Query(sql,DBRes,Error);
|
|
sDBConnPool.Query(sql,DBRes,Error);
|
|
@@ -329,7 +329,7 @@ void event_list::load_his_data_from_db()
|
|
|
|
|
|
ev->m_obj_type = static_cast<OBJECT_TYPE>(obj_type_id);
|
|
ev->m_obj_type = static_cast<OBJECT_TYPE>(obj_type_id);
|
|
ev->m_dis_type = static_cast<EVENT_DIS_TYPE>(dis_type);
|
|
ev->m_dis_type = static_cast<EVENT_DIS_TYPE>(dis_type);
|
|
- ev->m_obj_id = tool_other::to13str(obj_id);
|
|
|
|
|
|
+ ev->m_obj_id = obj_id;
|
|
ev->m_cur_time = tool_time::to_time_ex(cur_time);
|
|
ev->m_cur_time = tool_time::to_time_ex(cur_time);
|
|
|
|
|
|
ev->m_cur_value = cur_value;
|
|
ev->m_cur_value = cur_value;
|