fix log

event.cpp

@@ -357,10 +357,6 @@ std::string event_list::evs_to_json(std::vector<std::shared_ptr<ya_event>> arr)
     for(;it!=arr.end();++it)
     {
         _ev_to_node(*it, allocator, data);
-       // if((*it)->m_is_display)
-       // {
-       //     _ev_to_node(*it, allocator, data);
-       // }
     }
 
     doc.AddMember(JSON_ROOT_KEY_CMD,JSON_CMD_VALUE_EVENT, allocator);

module_service/area_business_person_attendance.cpp

@@ -98,13 +98,14 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
     {
         if(!tool_map::try_get_value(s_card_id, JSON_KEY_CALL_CARD_CARD_ID, (*it_card))
             ||!tool_map::try_get_value(type, JSON_KEY_CALL_CARD_CARD_TYPE_ID, (*it_card))
-            ||!tool_other::is_person(type)
             )
         {
             log_error("手工升井，web发来的数据 card_id 或 card_type格式不对");
             continue;
         }
         log_info("handle_up_card:%s,接收到手动升井的请求",s_card_id.c_str());
+        if(!tool_other::is_person(type))
+            continue;
         auto card_ptr = card_list::instance()->get(tool_other::card_id_to_u64(s_card_id));
         if(card_ptr && STATUS_LOST == card_ptr->m_biz_stat)
         {

net-service.cpp

@@ -96,8 +96,8 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 						index++;
 						task*t=task::alloc<message_locinfo>();
 						message_locinfo&m=t->body<message_locinfo>();
-						m.m_site_id=site_id;
 						m.load(is,false);
+						m.m_site_id=site_id;
 						m.m_time_stamp=tstamp;
 						//t_site->m_site_data = 0;
 
@@ -117,8 +117,8 @@ void net_service::on_message(std::shared_ptr<client> clt,const char*data,size_t
 					{
 						task*t=task::alloc<message_locinfo>();
 						message_locinfo&m=t->body<message_locinfo>();
-						m.m_site_id=site_id;
 						m.load(is,true);
+						m.m_site_id=site_id;
 						t->m_cmd_code=cmd;
 						t->m_hash_id=m.m_card_id;
 						m_sync_worker->translate(m);

select_tool.h

@@ -350,7 +350,7 @@ struct car_point_filter:select_point_object
 		//sit_location.set(sit->x,sit->y);
 		sit_location = sit->get_dstp(m_turning_pt);
 		if(sit_location.empty())
-		  std_error("get_dstp point error.....");
+		  std_error("%d get_dstp point error.....",sit->m_id);
 		double dist1=sit_location.dist(rpt);
 		double dist2=sit_location.dist(m_turning_pt);
 		double dist3=m_turning_pt.dist(rpt);	// dist1 is supposed to be = dist2+dist3

websocket/wsTimerThread.cpp

@@ -32,7 +32,7 @@ namespace YA
         }
         __Thread->interrupt();
         __Running = false;
-		std::cout << "::Stop() begin" << std::endl;
+		std::cout << "wsTimerThread::Stop() begin" << std::endl;
 
 		__Enable = false;
 
@@ -45,7 +45,7 @@ namespace YA
 		__Reset();
         __Thread=nullptr;
 
-		std::cout << "::Stop() end" << std::endl;
+		std::cout << "wsTimerThread::Stop() end" << std::endl;
 	}
 
 	void wsTimerThread::__Reset()