add log fro att.分站id变成-id,坐标保留3位数

ant.cpp

@@ -314,7 +314,7 @@ void sit_list::read_sit_list(int id)
 }
 void site::create_area()
 {
-    m_area=std::make_shared<area>(m_id,0,0,m_scale,m_map_id,1<<9);
+    m_area=std::make_shared<area>(-m_id,0,0,m_scale,m_map_id,1<<9);
 }
 /*
    处理分站供电状态，交流供电时，ac_down=false，直流供电时,ac_down=true

card_base.cpp

@@ -36,15 +36,15 @@ void card_location_base::on_location(const std::vector<point>&vp,const std::vect
 	pt.y=-pt.y;
 	if(pt.m_useless)
 	{
-		x = pt.x;
-		y = pt.y;
+		x = tool_other::round(pt.x,3);
+		y = tool_other::round(pt.y,3);
 
 		//Msg m;
 		//m.type=m_type;m.x=(int)x;m.y=(int)y;m.cmd=CMD_HANDLE;m.cardid=m_type<<32|m_id;
 		//cardMgr::instance()->tryPut(m);
 		double acc = lm[0].m_acc;
         m_acc = lm[0].m_acc;
-		log_info("useful:card_id:%d,ct:%d,timestamp:%llu, loc_point,x:%.2f,y:%.2f acc:%.2f",m_id,m_ct,m_time,pt.x,pt.y,acc);
+		log_info("useful:card_id:%d,ct:%d,timestamp:%llu, loc_point,x:%f,y:%f acc:%.2f",m_id,m_ct,m_time,x,y,acc);
 		do_business(lm.front().m_sit, pt, acc);
 	}
 }
@@ -60,9 +60,9 @@ void card_location_base::on_message(zloop<task*> * loop,const message_locinfo&lo
 void card_location_base::upt_card_pos(YA::_CARD_POS_&cp, const point &pt)
 {
 //	YA::_CARD_POS_ cp;
-	cp.x = pt.x;
-	cp.y = pt.y;
-	cp.z = pt.z;
+	cp.x = tool_other::round(pt.x,3);
+	cp.y = tool_other::round(pt.y,3);
+	//cp.z = pt.z;
 
 	cp.Type=m_type;
 	cp.ID = m_id;

common_tool.h

@@ -26,7 +26,18 @@
 class tool_other
 {
 public:
-
+    static double round(double dVal, int iPlaces)
+    {
+        double dRetval;
+        double dMod = 0.0000001;
+        if (dVal<0.0) dMod=-0.0000001;
+        dRetval=dVal;
+        dRetval+=(5.0/pow(10.0,iPlaces+1.0));
+        dRetval*=pow(10.0,iPlaces);
+        dRetval=floor(dRetval+dMod);
+        dRetval/=pow(10.0,iPlaces);
+        return(dRetval);
+    }
     static std::string to13str(std::string& str)
     {
         uint64_t tmp = std::stoull(str);
@@ -50,24 +61,24 @@ public:
     {
         return std::stoi(to13str(str).substr(0, 3));
     }
-	static int card_id_to_type(const std::string &cardid)
-	{
-		return std::stoi(cardid.substr(0,3));
-	}
-	static int card_id_to_id(const std::string &cardid)
-	{
-		return atoi(cardid.substr(3).c_str());
-	}
-	static std::string type_id_to_str(int32_t type,uint32_t id)  
-	{
+    static int card_id_to_type(const std::string &cardid)
+    {
+        return std::stoi(cardid.substr(0,3));
+    }
+    static int card_id_to_id(const std::string &cardid)
+    {
+        return atoi(cardid.substr(3).c_str());
+    }
+    static std::string type_id_to_str(int32_t type,uint32_t id)  
+    {
         char sql[15] = {0};
         snprintf(sql, 15,"%03d%010d", type, id);
         return std::string(sql);
-	}
-	static uint64_t type_id_to_u64(uint64_t type,uint32_t id)
-	{
-		return type<<32|id;
-	}
+    }
+    static uint64_t type_id_to_u64(uint64_t type,uint32_t id)
+    {
+        return type<<32|id;
+    }
     static bool is_person(int32_t type)
     {
         return CT_PERSON == type;
@@ -77,17 +88,17 @@ public:
     {
         return CT_VEHICLE == type || CT_COAL_CUTTER == type || CT_HEADING_MACHINE == type;
     }
-	static std::string get_string_cardid(uint64_t id)
-	{
-		uint64_t type = id>>32;
-		uint32_t cid = id & (~(type<<32));
-		return type_id_to_str(type,cid);
-	}
+    static std::string get_string_cardid(uint64_t id)
+    {
+        uint64_t type = id>>32;
+        uint32_t cid = id & (~(type<<32));
+        return type_id_to_str(type,cid);
+    }
 
-	static uint64_t card_id_to_u64(const std::string & cardid)
-	{
-		return type_id_to_u64(card_id_to_type(cardid),card_id_to_id(cardid));
-	}
+    static uint64_t card_id_to_u64(const std::string & cardid)
+    {
+        return type_id_to_u64(card_id_to_type(cardid),card_id_to_id(cardid));
+    }
 
     ///采煤机
     static bool is_coal(int32_t type)
@@ -111,7 +122,7 @@ class tool_map
 {
 public:
     static bool try_get_value(sio::message::ptr& out_data,
-                              const char* key, sio::message::ptr const& data)
+                const char* key, sio::message::ptr const& data)
     {
         auto map=data->get_map()[key];
         if(map && sio::message::flag_object == map->get_flag())
@@ -184,7 +195,7 @@ public:
     }
 
     static bool try_get_value(std::vector<sio::message::ptr>& out_data,
-                               const char* key, sio::message::ptr const& data)
+                const char* key, sio::message::ptr const& data)
     {
         auto map=data->get_map()[key];
         if(map && sio::message::flag_array == map->get_flag())
@@ -201,7 +212,7 @@ class tool_json
 {
 public:
     static void add_member(rapidjson::Value& out_data, const char* key, std::string value,
-                              rapidjson::Document::AllocatorType& allocator)
+                rapidjson::Document::AllocatorType& allocator)
     {
         rapidjson::Value name;
         name.SetString(key, allocator);
@@ -213,7 +224,7 @@ public:
     }
 
     static void push_back(rapidjson::Value& out_data, std::string value,
-                              rapidjson::Document::AllocatorType& allocator)
+                rapidjson::Document::AllocatorType& allocator)
     {
         rapidjson::Value data;
         data.SetString(value.c_str(), allocator);
@@ -222,7 +233,7 @@ public:
     }
 
     static bool try_get_iter(const char* key, const rapidjson::Value& node,
-                             rapidjson::Value::ConstMemberIterator& out_iter)
+                rapidjson::Value::ConstMemberIterator& out_iter)
     {
         if(node.IsObject())
         {

db/db_tool.cpp

@@ -64,6 +64,8 @@ namespace db_tool
                 card_ptr->m_id, start_str.c_str(), end_str.c_str(),
                 landmarkid, landmarkdirect, landmarkdist);
 
+        log_info("attendance():%s",sql);
+
         PushAsync(sql);
     }
 }

module_service/area_business_person_attendance.cpp

@@ -11,64 +11,25 @@
 #include "websocket/wsClientMgr.h"
 #include"tool_time.h"
 #include "module_meta_date_changed.h"
-
-struct person_attendance_data:business_data
-{
-    person_attendance_data():m_is_attendance(false)
-      ,m_attendance_start_time(std::chrono::seconds(0))
-    {
-    }
-
-    ///考勤状态  0初始状态 1 没在考勤 2 考勤;参看ATTENDANCE_STATUS
-    bool m_is_attendance;
-    ///考勤开始时间
-    std::chrono::system_clock::time_point m_attendance_start_time;
-};
-
-area_business_person_attendance::area_business_person_attendance()
-{
-}
-
-void area_business_person_attendance::on_load_his(const std::shared_ptr<area_hover>&area_hover_ptr,
-                                            const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
-{
-
-}
-
 //记录进入时间等信息,结束考勤,根据离开的时间和距离，判断是否记录一条新的考勤记录
 void area_business_person_attendance::on_enter(const std::shared_ptr<area_hover>&area_hover_ptr,
                                                const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
 {
+    log_info("on_enter:person_att:%d",card_ptr->m_id);
     if(!card_ptr->is_person())
-    {
         return;
-    }
 
     auto mine_tool_ptr = card_ptr->get_mine_tool();
     if(!mine_tool_ptr->m_is_attendance)
     {
-        //考勤开始
         mine_tool_ptr->m_is_attendance=true;
-        //mine_tool_ptr->m_attendance_start_time=std::chrono::system_clock::now();
         mine_tool_ptr->m_attendance_start_time=
                 std::chrono::system_clock::time_point(std::chrono::milliseconds(area_hover_ptr->m_enter_time));
 
         //作为一条开始考勤记录保存到数据库
         db_tool::save_attendance(card_ptr, area_hover_ptr);
 
-        //        log_info("人卡考勤开始：卡id=%d，卡type=%d，分站id=%d,分站reader_type_id=%d,stat_attendance=%d",
-        //                 card_ptr->m_id, card_ptr->m_type,
-        //                 site_ptr->m_id,site_ptr->m_reader_type_id,mine_tool_ptr->m_is_attendance);
     }
-
-    //    auto ptr_temp = std::make_shared<person_attendance_data>();
-    //    ptr = ptr_temp;
-
-    //    ptr_temp->m_is_attendance = true;
-    //    ptr_temp->m_attendance_start_time = std::chrono::system_clock::now();
-
-    //    //作为一条开始考勤记录保存到数据库
-    //    db_tool::save_attendance(card_ptr, ptr_temp->m_is_attendance, ptr_temp->m_attendance_start_time);
 }
 
 void area_business_person_attendance::on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
@@ -80,15 +41,10 @@ void area_business_person_attendance::on_leave(const std::shared_ptr<area_hover>
                                                const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
     if(!card_ptr->is_person())
-    {
         return;
-    }
-
     auto mine_tool_ptr = card_ptr->get_mine_tool();
     if(!mine_tool_ptr->m_is_attendance)
-    {
         return;
-    }
 
     //考勤结束
     mine_tool_ptr->m_is_attendance=false;
@@ -101,12 +57,6 @@ void area_business_person_attendance::on_leave(const std::shared_ptr<area_hover>
     rapidjson::Document::AllocatorType& allocator=doc.GetAllocator();
 
     _to_json_card_up_one(card_ptr, datas, allocator);
-    //module_meta_date_changed::clear_card(card_ptr);
-
-    //    auto rea_tool = card_ptr->get_area_tool();
-    //    rea_tool->on_leave(card_ptr);
-    //    card_ptr->clear();
-
     //升井json发给web
     if(datas.Size() > 0)
     {
@@ -117,23 +67,6 @@ void area_business_person_attendance::on_leave(const std::shared_ptr<area_hover>
         swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
     }
 
-    //up_mine(card_ptr, false);
-
-    //    if(nullptr == ptr)
-    //    {
-    //        log_error("结束考勤失败：nullptr == ptr");
-    //        return;
-    //    }
-
-    //    auto ptr_temp = static_cast<person_attendance_data*>(ptr.get());
-
-    //    if(ptr_temp->m_is_attendance)
-    //    {
-    //        ptr_temp->m_is_attendance = false;
-
-    //        //作为一条开始考勤记录保存到数据库
-    //        db_tool::save_attendance(card_ptr, ptr_temp->m_is_attendance, ptr_temp->m_attendance_start_time);
-    //    }
 }
 
 /**

module_service/area_business_person_attendance.h

@@ -9,14 +9,11 @@
 
 struct area_business_person_attendance:area_business
 {
-    area_business_person_attendance();
-
     int area_business_type()
     {
         return 5;
     }
 
-    void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
 
     //记录进入时间等信息,开始考勤
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);

module_service/module_web.cpp

@@ -142,18 +142,3 @@ void module_web::_delete_end(std::vector<std::shared_ptr<ya_event>>& arr)
     }
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

znet.cpp

@@ -439,7 +439,6 @@ struct sock_client:fd_io,client_ex
 
 	bool check_crc(const char*b,size_t mlen)
 	{
-        return true;
 		uint16_t crc=b[mlen-2];
 		crc<<=8;
 		crc|=b[mlen-1];