Browse Source

手动升井..

zzj 6 years ago
parent
commit
195e193974
3 changed files with 3 additions and 4 deletions
  1. 0 1
      card_base.cpp
  2. 0 2
      card_base.h
  3. 3 1
      module_service/area_business_person_attendance.cpp

+ 0 - 1
card_base.cpp

@@ -155,7 +155,6 @@ void  card_location_base::clear()
 {
 //	uint16_t m_display;			//1显示0不显示,往前端推送
     m_speed=0;			//速度
-    m_is_attendance=0;	//井上井下状态  0初始状态 1 井上 2 井下
     m_stat=0;			//运动静止状态
     //m_ct;				//ct
     m_time=0;			//时间戳

+ 0 - 2
card_base.h

@@ -36,7 +36,6 @@ struct card:point
 		,m_type(type)
 		,m_display(dis)
 		,m_speed(0)
-		,m_is_attendance(0)
 		,m_stat(0)
 		,m_ct(0)
 		,m_time(0)
@@ -51,7 +50,6 @@ struct card:point
 	uint64_t m_type;			//类型
 	uint16_t m_display;			//1显示0不显示,往前端推送
 	double   m_speed;			//速度
-	int      m_is_attendance;	//井上井下状态  0初始状态 1 井上 2 井下
 	int		 m_stat;			//运动静止状态
 	uint16_t m_ct;				//ct
     uint64_t m_time;			//时间戳 ms

+ 3 - 1
module_service/area_business_person_attendance.cpp

@@ -110,7 +110,9 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
         if(card_ptr && STATUS_LOST == card_ptr->m_biz_stat)
         {
             log_info("handle_up_card:%s 手工升井,处理",s_card_id.c_str());
-            module_meta_date_changed::clear_card(card_ptr);
+
+			card_ptr->inc_upmine_flag();
+//            module_meta_date_changed::clear_card(card_ptr);
         }
         else
             log_warn("handle_up_card:%s,手动升井的卡找不到,或者该卡不在盲区",s_card_id.c_str());