|
|
@@ -14,6 +14,8 @@
|
|
|
#include "websocket/ws_common.h"
|
|
|
#include "event.h"
|
|
|
#include "mine_business.h"
|
|
|
+#include"common_tool.h"
|
|
|
+#include"db/db_tool.h"
|
|
|
|
|
|
person::person(const std::string &type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid,int wl,const std::string &sname,const std::string &dname)
|
|
|
:card_location_base(type,cardid,needdisplay,t,deptid,level_id,cid)
|
|
|
@@ -113,8 +115,8 @@ void person::handle_three_rates(const point & pt)
|
|
|
cp.biz_stat = m_biz_stat;
|
|
|
cp.x=pt.x;cp.y=pt.y;cp.z=pt.z;
|
|
|
const auto lm = m_area_tool->getLandmark();
|
|
|
- cp.enter_time = std::get<0>(lm)*1000;
|
|
|
- cp.area_id = std::get<3>(lm);
|
|
|
+// cp.enter_time = std::get<0>(lm)*1000;
|
|
|
+// cp.area_id = std::get<3>(lm);
|
|
|
put_three_rates(cp);
|
|
|
}
|
|
|
|
|
|
@@ -123,7 +125,7 @@ void person::on_timer()
|
|
|
//人员井下超时
|
|
|
// m_mine_tool->on_check_overtime(this->m_id,this->m_type);
|
|
|
|
|
|
- if(!m_mine_tool->is_attendance())
|
|
|
+ if(!m_mine_tool->m_is_attendance)
|
|
|
return;
|
|
|
YA::_CARD_POS_ cp;
|
|
|
if(m_display)
|
daiyueteng