Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

event.cpp

@@ -235,7 +235,7 @@ void event_list::save_event(std::shared_ptr<ya_event> ev_ptr)
     char sql[LENGTH_SQL] = {0};
     std::string _time = tool_time::to_str_ex(ev_ptr->m_cur_time);
     sprintf(sql,
-            "INSERT IGNORE INTO his_event_data(event_id,id, stat, event_type_id, obj_type_id, obj_id, dis_type\
+            "INSERT IGNORE INTO his_event_data(event_id,id, stat, event_type_id, obj_type_id, obj_id, dis_type,\
             map_id, area_id, limit_value, cur_value, x, y, cur_time, description) \
             VALUES(%ld,%ld, %d, %d, %d, %s, %d, %d, %d, %.2f, %.2f, %f, %f, '%s', '%s');",
             ev_ptr->m_ev_id,ev_ptr->m_id,ev_ptr->m_status, ev_ptr->m_ev_type, ev_ptr->m_obj_type, ev_ptr->m_obj_id.c_str(),ev_ptr->m_dis_type,

main.cpp

@@ -44,18 +44,7 @@ struct Init_Setting
 {
     void init()
     {
-        std::string url=config.get("service.websocket_url","ws://127.0.0.1:8086");
-        int32_t send_interval =config.get("service.interval_send_json_postion",1);
-        std_info("json_interval:%d",send_interval);
-        std::vector<std::string> url_list;
-        url_list.push_back(url);
-        if(!wsClientMgr_init(url_list,send_interval))
-        {
-            std_info("连接Web Server 失败，采集服务器无法启动!");
-            exit(0);
-        }
         YADB::_DB_POOL_SETTING_ DBSetting;
-
         DBSetting.Host = config.get("db.host","127.0.0.1");
         DBSetting.User = config.get("db.user","root");
         DBSetting.PWD = config.get("db.passwd","123456");
@@ -69,6 +58,7 @@ struct Init_Setting
             std_info("连接DB[%s:%s] 失败，采集服务器无法启动!",DBSetting.Host.c_str(),DBSetting.User.c_str());
             exit(0);
         }
+
 		CYaSetting::Init_sys_setting();
         sit_list::instance()->load_from_db();
         card_list::instance()->init_card_from_db();
@@ -94,19 +84,21 @@ struct Init_Setting
         dp.CharSet=DBSetting.CharSet ;
         dp.TimeOut=DBSetting.TimeOut;
         dp.PoolSize=DBSetting.PoolSize;
-	init_three_rates(dp);
+		init_three_rates(dp);
 
-        printf("Init_Setting::init  Success. \n" );
+        log_info("Init_Setting::init  Success. \n" );
     }
+
 	void init_three_rates(const db_para& dbs)
 	{
-		std_info("three_rates ...................");
+		log_info("init three_rates ...................");
 		init_para ip;
 		ip.send_pt = handlereader;
 		ip.driving_face_alarm = Handle_ThreeRates_Event_Callback;
 		three_rates::get_instance()->init(ip,dbs);
 		three_rates::get_instance()->start();
 	}
+
     bool _mysql_init(YADB::_DB_POOL_SETTING_ &dps)
     {
         std::string szError = "";