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

common_tool.h

@@ -87,6 +87,23 @@ public:
 	{
 		return type_id_to_u64(card_id_to_type(cardid),card_id_to_id(cardid));
 	}
+
+    ///采煤机
+    static bool is_coal(int32_t type)
+    {
+        return CT_COAL_CUTTER == type;
+    }
+
+    /// 掘进机
+    static bool is_driving(int32_t type)
+    {
+        return CT_HEADING_MACHINE == type;
+    }
+
+    static bool is_coal_or_driving(int32_t type)
+    {
+        return CT_COAL_CUTTER == type || CT_HEADING_MACHINE == type;
+    }
 };
 
 class tool_map

module_service/area_business_car_attendance.cpp

@@ -34,7 +34,18 @@ void area_business_car_attendance::on_enter(const std::shared_ptr<area_hover>&ar
         return;
     }
 
-    save_attendance(card_ptr, area_hover_ptr);
+    auto mine_tool_ptr = card_ptr->get_mine_tool();
+    if(!mine_tool_ptr->m_is_attendance)
+    {
+        return;
+    }
+
+    //考勤结束
+    mine_tool_ptr->m_is_attendance=false;
+    //作为一条结束考勤记录保存到数据库
+    db_tool::save_attendance(card_ptr);
+
+    //save_attendance(card_ptr, area_hover_ptr);
 
     //    auto ptr_temp = std::make_shared<car_attendance_data>();
     //    ptr = ptr_temp;
@@ -91,6 +102,35 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&a,
     //        db_tool::save_attendance(card_ptr, ptr_temp->m_is_attendance, ptr_temp->m_attendance_start_time);
     //    }
 }
+
+/////area_hover_ptr==nullptr 表示接收到 web的删除卡命令
+//void area_business_car_attendance::save_attendance(const std::shared_ptr<card_location_base>& card_ptr,
+//                                                  const std::shared_ptr<area_hover> area_hover_ptr)
+//{
+//    auto mine_tool_ptr = card_ptr->get_mine_tool();
+//    if(!mine_tool_ptr->m_is_attendance)
+//    {
+//        return;
+//    }
+
+//    //考勤结束
+//    mine_tool_ptr->m_is_attendance=false;
+//    //作为一条结束考勤记录保存到数据库
+//    db_tool::save_attendance(card_ptr);
+
+////    if(area_hover_ptr)
+////    {
+////        log_info("车卡考勤结束：卡id=%d，卡type=%d，区域id=%d, stat_attendance=%d",
+////                 card_ptr->m_id, card_ptr->m_type,
+////                 area_ptr->m_id,mine_tool_ptr->m_stat_attendance);
+////    }
+////    else
+////    {
+////        log_info("收到web的删除卡命令，车卡考勤结束：卡id=%d，卡type=%d，stat_attendance=%d",
+////                 card_ptr->m_id, card_ptr->m_type,mine_tool_ptr->m_stat_attendance);
+////    }
+//}
+
 #if 0
 
 //void area_business_car_attendance::init_attendance_area_from_db()
@@ -127,31 +167,5 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&a,
 
 #endif
 
-///area_hover_ptr==nullptr 表示接收到 web的删除卡命令
-void area_business_car_attendance::save_attendance(const std::shared_ptr<card_location_base>& card_ptr,
-                                                  const std::shared_ptr<area_hover> area_hover_ptr)
-{
-    auto mine_tool_ptr = card_ptr->get_mine_tool();
-    if(!mine_tool_ptr->m_is_attendance)
-    {
-        return;
-    }
 
-    //考勤结束
-    mine_tool_ptr->m_is_attendance=false;
-    //作为一条结束考勤记录保存到数据库
-    db_tool::save_attendance(card_ptr);
-
-//    if(area_hover_ptr)
-//    {
-//        log_info("车卡考勤结束：卡id=%d，卡type=%d，区域id=%d, stat_attendance=%d",
-//                 card_ptr->m_id, card_ptr->m_type,
-//                 area_ptr->m_id,mine_tool_ptr->m_stat_attendance);
-//    }
-//    else
-//    {
-//        log_info("收到web的删除卡命令，车卡考勤结束：卡id=%d，卡type=%d，stat_attendance=%d",
-//                 card_ptr->m_id, card_ptr->m_type,mine_tool_ptr->m_stat_attendance);
-//    }
-}
 

module_service/area_business_car_attendance.h

@@ -21,8 +21,8 @@ public:
     void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
 
 //    static void init_attendance_area_from_db();
-    ///area_hover_ptr==nullptr 表示接收到 web的删除卡命令
-    static void save_attendance(const std::shared_ptr<card_location_base>& card_ptr, const std::shared_ptr<area_hover> area_hover_ptr);
+//    ///area_hover_ptr==nullptr 表示接收到 web的删除卡命令
+//    static void save_attendance(const std::shared_ptr<card_location_base>& card_ptr, const std::shared_ptr<area_hover> area_hover_ptr);
 
 //private:
 //    bool is_not_attendance_area(int area_id, int vehicle_type_id)

module_service/area_business_card_enter_or_leave.cpp

@@ -11,7 +11,7 @@ struct enter_or_leave_data:business_data
 {
     enter_or_leave_data()
     {
-        m_enter_time_ms = tool_time::to_ms(std::chrono::system_clock::now());
+        m_enter_time_ms = tool_time::now_to_ms();
     }
 
     ///考勤开始时间
@@ -54,13 +54,6 @@ void area_business_card_enter_or_leave::save_his_area_location_enter(const std::
     char sql[LENGTH_SQL] = {0};
 
     std::string call(card_ptr->is_vehicle()?"add_area_vehicle":"add_area_staff");
-#if 0
-    std::string call("add_area_staff");
-    if(card_ptr->is_vehicle())//车卡
-    {
-        call="add_area_vehicle";
-    }
-#endif
 
     std::string start_str = tool_time::to_str_ex(start_time_ms);
 
@@ -79,13 +72,6 @@ void area_business_card_enter_or_leave::save_his_area_location_leave(const std::
     char sql[LENGTH_SQL] = {0};
 
     std::string call(card_ptr->is_vehicle()?"add_area_vehicle":"add_area_staff");
-#if 0
-    std::string call("add_area_staff");
-    if(card_ptr->is_vehicle())//车卡
-    {
-        call="add_area_vehicle";
-    }
-#endif
 
     std::string start_str = tool_time::to_str_ex(start_time_ms);
     std::string end_str = tool_time::to_str_ex(tool_time::now_to_ms());

module_service/area_business_geofault.cpp

@@ -10,6 +10,9 @@
 #include"common_tool.h"
 #include"log.h"
 #include"card.h"
+#include"config_file.h"
+#include"point.h"
+#include"area.h"
 
 struct geofault_data:business_data
 {
@@ -17,18 +20,25 @@ struct geofault_data:business_data
     {
         m_near_geofault_count=0;
         m_far_geofault_count=0;
+        m_is_warning=false;
     }
 
     int m_near_geofault_count;
     int m_far_geofault_count;
+    bool m_is_warning;
 };
 
 std::unordered_map<int, std::vector<point>> area_business_geofault::_area_geofault_map;
 int area_business_geofault::_geofault_count_limit;
 
 void area_business_geofault::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)
+                                      const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>& ptr)
 {
+    if(!tool_other::is_coal_or_driving(card_ptr->m_type))
+    {
+        return;
+    }
+
     auto ptr_temp = std::make_shared<geofault_data>();
     ptr = ptr_temp;
 
@@ -37,20 +47,34 @@ void area_business_geofault::on_enter(const std::shared_ptr<area_hover>&area_hov
     {
         ptr_temp->m_near_geofault_count++;
     }
+    else
+    {
+        ptr_temp->m_far_geofault_count++;
+    }
+
+    auto ev_ptr_temp = event_list::instance()->get_event_card(card_ptr->m_id, card_ptr->m_type, ET_VEHICLE_NEAR_GEOFAULT);
+    ptr_temp->m_is_warning = (nullptr != ev_ptr_temp && !ev_ptr_temp->is_end());
 }
 
 void area_business_geofault::on_hover(const std::shared_ptr<area_hover>&area_hover_ptr,
                                       const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
+    if(!tool_other::is_coal_or_driving(card_ptr->m_type))
+    {
+        return;
+    }
+
     auto ptr_temp = static_cast<geofault_data*>(ptr.get());
 
     double dist=0;
     if(_is_near(area_hover_ptr->m_area, card_ptr->x, card_ptr->y, dist))
     {
+        ptr_temp->m_far_geofault_count=0;
         ptr_temp->m_near_geofault_count++;
     }
     else
     {
+        ptr_temp->m_near_geofault_count=0;
         ptr_temp->m_far_geofault_count++;
     }
 
@@ -59,14 +83,13 @@ void area_business_geofault::on_hover(const std::shared_ptr<area_hover>&area_hov
     {
         ptr_temp->m_near_geofault_count=_geofault_count_limit;
 
-        auto ev_ptr = event_list::instance()->get_event_card(card_ptr->m_id, card_ptr->m_type, ET_VEHICLE_NEAR_GEOFAULT);
-        if(!ev_ptr)//从没有告警状态转化为告警状态
+        if(!ptr_temp->m_is_warning)
         {
-            ptr_temp->m_far_geofault_count=0;
+            ptr_temp->m_is_warning = true;
+            uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+            event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id,
+                                                 CYaSetting::m_sys_setting.geofault_warn_dis, dist, true);
         }
-
-        uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-        event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id, CYaSetting::m_sys_setting.geofault_warn_dis, dist, true);
     }
 
     //确定正常
@@ -74,25 +97,46 @@ void area_business_geofault::on_hover(const std::shared_ptr<area_hover>&area_hov
     {
         ptr_temp->m_far_geofault_count=_geofault_count_limit;
 
-        auto ev_ptr = event_list::instance()->get_event_card(card_ptr->m_id, card_ptr->m_type, ET_VEHICLE_NEAR_GEOFAULT);
-        if(ev_ptr && !ev_ptr->is_end())
+        if(ptr_temp->m_is_warning)
         {
-            ptr_temp->m_near_geofault_count=0;
+            ptr_temp->m_is_warning = false;
 
             uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-            event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id, CYaSetting::m_sys_setting.geofault_warn_dis, dist, false);
+            event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id,
+                                                 CYaSetting::m_sys_setting.geofault_warn_dis, dist, false);
         }
     }
 }
 
-
 void area_business_geofault::on_leave(const std::shared_ptr<area_hover>&area_hover_ptr,
                                       const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
+    if(!tool_other::is_coal_or_driving(card_ptr->m_type))
+    {
+        return;
+    }
+
     uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
     event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id, CYaSetting::m_sys_setting.geofault_warn_dis, 1000, false);
 }
 
+void area_business_geofault::init(config_file& config)
+{
+    _geofault_count_limit = std::stoi(config.get("service.geofault_count_limit","10"));
+}
+
+std::string area_business_geofault::_points2str(std::vector<point>& points)
+{
+    std::string str;
+    for(auto&p : points)
+    {
+        char ch[64] = {0};
+        sprintf(ch, "x=%f,y=%f;", p.x, p.y);
+        str.append(ch);
+    }
+
+    return str;
+}
 
 void area_business_geofault::init_geofault_from_db()
 {
@@ -148,8 +192,8 @@ void area_business_geofault::init_geofault_from_db()
     for(const auto &p : _area_geofault_map)
     {
         auto kk = p.second;
-        std_debug("init_geofault_from_db:area_id:%d--points: %s",p.first, points2str(kk).c_str());
-        log_info("init_geofault_from_db:area_id:%d--points: %s",p.first, points2str(kk).c_str());
+        std_debug("init_geofault_from_db:area_id:%d--points: %s",p.first, _points2str(kk).c_str());
+        log_info("init_geofault_from_db:area_id:%d--points: %s",p.first, _points2str(kk).c_str());
     }
 }
 

module_service/area_business_geofault.h

@@ -7,13 +7,13 @@
  * @date 2019-01-15
  */
 
-#include<area_business.h>
+#include"area_business.h"
 #include <unordered_map>
 #include<vector>
-#include<area.h>
-#include<point.h>
 
-#include"config_file.h"
+struct config_file;
+struct point;
+struct area;
 
 /**
  * @brief 当采煤机和掘进机有数据点过来的时候，判断当前点与地址断层坐标点的距离d。如d<设置的阈值，则告警，d>阈值则取消。
@@ -30,10 +30,7 @@ public:
     void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
     void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
 
-    static void init(config_file& config)
-    {
-        _geofault_count_limit = std::stoi(config.get("service.geofault_count_limit","10"));
-    }
+    static void init(config_file& config);
 
     static void init_geofault_from_db();
 
@@ -69,18 +66,7 @@ private:
         return arr;
     }
 
-    static std::string points2str(std::vector<point>& points)
-    {
-        std::string str;
-        for(auto&p : points)
-        {
-            char ch[64] = {0};
-            sprintf(ch, "x=%f,y=%f;", p.x, p.y);
-            str.append(ch);
-        }
-
-        return str;
-    }
+    static std::string _points2str(std::vector<point>& points);
 
 private:
     //area_id: points

module_service/area_business_motionless_persion.cpp

@@ -14,76 +14,98 @@
 struct motionless_data:business_data
 {
     motionless_data()
-		:m_acc_0count(0)
-		,m_warn_flag(false)
+        :m_acc_0count(0)
+        ,m_is_warning(false)
     {
-//        m_acc_0count=0;
-//        m_acc_start_time=0;
+        //        m_acc_0count=0;
+        //        m_acc_start_time=0;
     }
 
+    ///;检测到多少次之后定位完全静止
+    //   std::atomic<int> m_acc_0count;
+    //    ///检测到多久之后告警
+    //    time_t m_acc_start_time;
 
-   ///;检测到多少次之后定位完全静止
- //   std::atomic<int> m_acc_0count;
-//    ///检测到多久之后告警
-//    time_t m_acc_start_time;
-
-	int m_acc_0count; //连续静止数量
-	bool m_warn_flag;  //告警推送标志
+    int m_acc_0count; //连续静止数量
+    bool m_is_warning;  //
 };
 
 void area_business_motionless_persion::init(config_file& config)
 {
-	//       sleep_ms = std::stoi(config.get("service.motionless_thread_sleep_ms","5000"));
-	_acc_0count_limit = std::stoi(config.get("service.motionless_acc_0count_limit","40"));
-	//        _acc_seconds_limit = std::stoi(config.get("service.motionless_acc_seconds_limit","120"));
+    //       sleep_ms = std::stoi(config.get("service.motionless_thread_sleep_ms","5000"));
+    _acc_0count_limit = std::stoi(config.get("service.motionless_acc_0count_limit","40"));
+    //        _acc_seconds_limit = std::stoi(config.get("service.motionless_acc_seconds_limit","120"));
 }
 
 void area_business_motionless_persion::on_enter(const std::shared_ptr<area_hover>&a,
-                                 const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
+                                                const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
 {
+    if(!card_ptr->is_person())
+    {
+        return;
+    }
+
     auto ptr_temp = std::make_shared<motionless_data>();
     ptr = ptr_temp;
+
+    auto ev_ptr_temp = event_list::instance()->get_event_card(card_ptr->m_id, card_ptr->m_type, ET_CARD_MOTIONLESS);
+    ptr_temp->m_is_warning = (nullptr != ev_ptr_temp && !ev_ptr_temp->is_end());
 }
 
 void area_business_motionless_persion::on_hover(const std::shared_ptr<area_hover>&area_hover_ptr,
-                                         const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
+                                                const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
-    auto ptr_temp = static_cast<motionless_data*>(ptr.get());
+    if(!card_ptr->is_person())
+    {
+        return;
+    }
 
-	bool do_send=false;//是否需要发送
+    auto ptr_temp = static_cast<motionless_data*>(ptr.get());
 
     if(0 == static_cast<int>(card_ptr->m_acc))
     {
-        if((do_send = ++ptr_temp->m_acc_0count >= _acc_0count_limit && !ptr_temp->m_warn_flag))		//检测计数 && 是否已经发送，已经发送的话，就不发了
-		{
-			ptr_temp->m_warn_flag=true;	//如果确定发送的话，更新数据状态
-		}
+        ++ptr_temp->m_acc_0count;
     }
     else
     {
         ptr_temp->m_acc_0count=0;
-		if((do_send=ptr_temp->m_warn_flag))//如果正在告警，则取消告警
-		{
-			ptr_temp->m_warn_flag=false;
-		}
     }
 
-	if(do_send)//需要发送
-	{
-		uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-		event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, ptr_temp->m_warn_flag);
-	}
+    if(ptr_temp->m_acc_0count >= _acc_0count_limit)
+    {
+        ptr_temp->m_acc_0count = _acc_0count_limit;
+        if(!ptr_temp->m_is_warning)
+        {
+            ptr_temp->m_is_warning = true;
+            uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+            event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, true);
+        }
+    }
+    else
+    {
+        if(ptr_temp->m_is_warning)
+        {
+            ptr_temp->m_is_warning = false;
+            uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+            event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, false);
+        }
+    }
 }
 
 void area_business_motionless_persion::on_leave(const std::shared_ptr<area_hover>&area_hover_ptr,
-                                         const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
+                                                const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
+    if(!card_ptr->is_person())
+    {
+        return;
+    }
+
     auto ptr_temp = static_cast<motionless_data*>(ptr.get());
-	if(ptr_temp->m_warn_flag)//如果正在告警，则发送取消告警的信息
-	{
-		uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-		event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, false);
-	}
+    if(ptr_temp->m_is_warning)//如果正在告警，则发送取消告警的信息
+    {
+        uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+        event_tool::instance()->handle_event(OT_CARD, ET_CARD_MOTIONLESS, id, 0, 0, false);
+    }
 }
 
 int area_business_motionless_persion::_acc_0count_limit=20;

module_service/area_business_motionless_persion.h

@@ -26,17 +26,17 @@ struct config_file;
  */
 class area_business_motionless_persion : public area_business// : public i_thread, public singleton_base<module_motionless_persion>
 {
-//    void run()
-//    {
-//        auto cardlist = card_list::instance()->m_map;
-//        auto iter_m_map=cardlist.begin();
-//        for(;iter_m_map!=cardlist.end();++iter_m_map)
-//        {
-//            deal_alarm(iter_m_map->second);
-//        }
-//    }
-
-//    void deal_alarm(std::shared_ptr<card_location_base>& card_ptr);
+    //    void run()
+    //    {
+    //        auto cardlist = card_list::instance()->m_map;
+    //        auto iter_m_map=cardlist.begin();
+    //        for(;iter_m_map!=cardlist.end();++iter_m_map)
+    //        {
+    //            deal_alarm(iter_m_map->second);
+    //        }
+    //    }
+
+    //    void deal_alarm(std::shared_ptr<card_location_base>& card_ptr);
 private:
     static int _acc_0count_limit;
 
@@ -45,13 +45,11 @@ public:
     {
         return 10;
     }
-	static void init(config_file& config);
-
+    static void init(config_file& config);
 
     void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr);
     void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
     void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
-
 };
 
 #endif // MODULE_MOTIONLESS_PERSION_H

module_service/area_business_person_attendance.cpp

@@ -32,7 +32,7 @@ area_business_person_attendance::area_business_person_attendance()
 
 //记录进入时间等信息,结束考勤,根据离开的时间和距离，判断是否记录一条新的考勤记录
 void area_business_person_attendance::on_enter(const std::shared_ptr<area_hover>&a,
-                                            const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
+                                               const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data>&ptr)
 {
     if(!card_ptr->is_person())
     {
@@ -49,19 +49,19 @@ void area_business_person_attendance::on_enter(const std::shared_ptr<area_hover>
         //作为一条开始考勤记录保存到数据库
         db_tool::save_attendance(card_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);
+        //        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;
+    //    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();
+    //    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);
+    //    //作为一条开始考勤记录保存到数据库
+    //    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)
@@ -70,36 +70,13 @@ void area_business_person_attendance::on_hover(const std::shared_ptr<area_hover>
 }
 //记录离开考勤区域信息,开始考勤
 void area_business_person_attendance::on_leave(const std::shared_ptr<area_hover>&a,
-                                            const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
+                                               const std::shared_ptr<card_location_base>&card_ptr,std::shared_ptr<business_data> ptr)
 {
     if(!card_ptr->is_person())
     {
         return;
     }
 
-    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);
-//    }
-}
-
-///升井或收到web的删除卡命令  site_ptr==nullptr表示收到web的删除卡命令
-/// 保存考勤记录，发升井json，清理卡
-void area_business_person_attendance::up_mine(std::shared_ptr<card_location_base> card_ptr, bool is_web_delete)
-{
     auto mine_tool_ptr = card_ptr->get_mine_tool();
     if(!mine_tool_ptr->m_is_attendance)
     {
@@ -119,9 +96,9 @@ void area_business_person_attendance::up_mine(std::shared_ptr<card_location_base
     _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();
+    //    auto rea_tool = card_ptr->get_area_tool();
+    //    rea_tool->on_leave(card_ptr);
+    //    card_ptr->clear();
 
     //升井json发给web
     if(datas.Size() > 0)
@@ -133,17 +110,23 @@ void area_business_person_attendance::up_mine(std::shared_ptr<card_location_base
         swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
     }
 
-//    if(is_web_delete)
-//    {
-//        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);
-//    }
-//    else
-//    {
-//        log_info("收到web的删除卡命令,人卡考勤结束：卡id=%d，卡type=%d， stat_attendance=%d",
-//                 card_ptr->m_id, card_ptr->m_type, mine_tool_ptr->m_is_attendance);
-//    }
+    //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);
+    //    }
 }
 
 /**
@@ -158,9 +141,9 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
         return;
     }
 
-    rapidjson::Document doc(rapidjson::kObjectType);
-    rapidjson::Value datas(rapidjson::kArrayType);
-    rapidjson::Document::AllocatorType& allocator=doc.GetAllocator();
+//    rapidjson::Document doc(rapidjson::kObjectType);
+//    rapidjson::Value datas(rapidjson::kArrayType);
+//    rapidjson::Document::AllocatorType& allocator=doc.GetAllocator();
 
     std::vector<sio::message::ptr>::const_iterator it_card = card_vec.begin();
     int type = 0;
@@ -168,7 +151,7 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
     for(; it_card != card_vec.end(); ++it_card)
     {
         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_map::try_get_value(type, JSON_KEY_CALL_CARD_CARD_TYPE_ID, (*it_card)))
         {
             log_error("手工升井，web发来的数据 card_id 或 card_type格式不对");
             continue;
@@ -181,22 +164,27 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
             std_debug("手工升井，处理，卡id=%d，卡type=%d", id, type);
             log_info("手工升井，处理，卡id=%d，卡type=%d", id, type);
 
-            auto mine_tool_ptr = card_ptr->get_mine_tool();
-            if(mine_tool_ptr->m_is_attendance)
-            {
-                //考勤结束
-                mine_tool_ptr->m_is_attendance=false;
+            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();
+
+            //            auto mine_tool_ptr = card_ptr->get_mine_tool();
+            //            if(mine_tool_ptr->m_is_attendance)
+            //            {
+            //                //考勤结束
+            //                mine_tool_ptr->m_is_attendance=false;
 
-                //作为一条结束考勤记录保存到数据库
-                db_tool::save_attendance(card_ptr);
-            }
+            //                //作为一条结束考勤记录保存到数据库
+            //                db_tool::save_attendance(card_ptr);
+            //            }
 
             //检查井下是否超员--是否需要取消
             //CMineCardManager::instance()->OnPersonUp(card_ptr);
 
-            auto rea_tool = card_ptr->get_area_tool();
-			rea_tool->on_leave(card_ptr);
-			card_ptr->clear();
+            //            auto rea_tool = card_ptr->get_area_tool();
+            //			rea_tool->on_leave(card_ptr);
+            //			card_ptr->clear();
         }
         else
         {
@@ -204,20 +192,20 @@ void area_business_person_attendance::handle_up_mine(sio::message::ptr const& da
         }
     }
 
-    //升井json发给web
-    if(datas.Size() > 0)
-    {
-        doc.AddMember(JSON_ROOT_KEY_CMD,JSON_CMD_VALUE_UP_MINE, allocator);
-        //doc.AddMember(JSON_ROOT_KEY_VERSION,INTERFACE_VERSION, allocator);
-        doc.AddMember(JSON_ROOT_KEY_DATA, datas, allocator);
+//    //升井json发给web
+//    if(datas.Size() > 0)
+//    {
+//        doc.AddMember(JSON_ROOT_KEY_CMD,JSON_CMD_VALUE_UP_MINE, allocator);
+//        //doc.AddMember(JSON_ROOT_KEY_VERSION,INTERFACE_VERSION, allocator);
+//        doc.AddMember(JSON_ROOT_KEY_DATA, datas, allocator);
 
-        swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
-    }
+//        swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
+//    }
 }
 
 ///升井json
 void area_business_person_attendance::_to_json_card_up_one(std::shared_ptr<card_location_base> card_ptr,
-                                   rapidjson::Value& out_datas, rapidjson::Document::AllocatorType& allocator)
+                                                           rapidjson::Value& out_datas, rapidjson::Document::AllocatorType& allocator)
 {
     if(!card_ptr->m_display)
     {
@@ -268,3 +256,54 @@ void area_business_person_attendance::_to_json_card_up_one(std::shared_ptr<card_
     out_datas.PushBack(data, allocator);
 }
 
+
+/////升井或收到web的删除卡命令  site_ptr==nullptr表示收到web的删除卡命令
+///// 保存考勤记录，发升井json，清理卡
+//void area_business_person_attendance::up_mine(std::shared_ptr<card_location_base> card_ptr, bool is_web_delete)
+//{
+//    auto mine_tool_ptr = card_ptr->get_mine_tool();
+//    if(!mine_tool_ptr->m_is_attendance)
+//    {
+//        return;
+//    }
+
+//    //考勤结束
+//    mine_tool_ptr->m_is_attendance=false;
+
+//    //作为一条结束考勤记录保存到数据库
+//    db_tool::save_attendance(card_ptr);
+
+//    rapidjson::Document doc(rapidjson::kObjectType);
+//    rapidjson::Value datas(rapidjson::kArrayType);
+//    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)
+//    {
+//        doc.AddMember(JSON_ROOT_KEY_CMD,JSON_CMD_VALUE_UP_MINE, allocator);
+//        //doc.AddMember(JSON_ROOT_KEY_VERSION,INTERFACE_VERSION, allocator);
+//        doc.AddMember(JSON_ROOT_KEY_DATA, datas, allocator);
+
+//        swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
+//    }
+
+////    if(is_web_delete)
+////    {
+////        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);
+////    }
+////    else
+////    {
+////        log_info("收到web的删除卡命令,人卡考勤结束：卡id=%d，卡type=%d， stat_attendance=%d",
+////                 card_ptr->m_id, card_ptr->m_type, mine_tool_ptr->m_is_attendance);
+////    }
+//}
+

module_service/area_business_person_attendance.h

@@ -24,9 +24,9 @@ struct area_business_person_attendance:area_business
     //记录离开考勤区域信息,结束考勤
     void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr);
 
-    ///升井或收到web的删除卡命令  site_ptr==nullptr表示收到web的删除卡命令
-    /// 保存考勤记录，发升井json，清理卡
-    static void up_mine(std::shared_ptr<card_location_base> card_ptr, bool is_web_delete);
+    //    ///升井或收到web的删除卡命令  site_ptr==nullptr表示收到web的删除卡命令
+    //    /// 保存考勤记录，发升井json，清理卡
+    //    static void up_mine(std::shared_ptr<card_location_base> card_ptr, bool is_web_delete);
 
     /**
      * @brief 手工升井函数
@@ -36,7 +36,7 @@ struct area_business_person_attendance:area_business
 private:
     ///升井json
     static void _to_json_card_up_one(std::shared_ptr<card_location_base> card_ptr,
-                                       rapidjson::Value& out_datas, rapidjson::Document::AllocatorType& allocator);
+                                     rapidjson::Value& out_datas, rapidjson::Document::AllocatorType& allocator);
 };
 
 

module_service/module_call.h

@@ -196,7 +196,7 @@ public:
      */
     void init(config_file& config)
     {
-        sleep_ms = std::stoi(config.get("service.send_call_interval","5000"));
+        sleep_ms = std::stoi(config.get("service.send_call_interval_ms","5000"));
     }
 
 private:

module_service/module_meta_date_changed.cpp

@@ -9,6 +9,7 @@
 
 #include"ant.h"
 #include"card.h"
+#include"area.h"
 
 
 ///基础数据
@@ -103,34 +104,32 @@ void module_meta_date_changed::clear_card(std::shared_ptr<card_location_base> ca
 {
     auto rea_tool = card_ptr->get_area_tool();
     rea_tool->on_leave(card_ptr);
-    card_ptr->clear();
+    //card_ptr->clear();
 
-//    //删除
-//    //card_ptr->del_card_pos();
-//    // 升井 删除所有报警信息
-//    for(int i=0; i < CARD_EVENT_COUNT_MAX; i++ )
-//    {
-//        if (i == EVENT_TYPE::ET_CARD_LOW_POWER_SERIOUS)
-//        {
-//            continue;
-//        }
-
-//        uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-//        event_tool::instance()->handle_event(OT_CARD, static_cast<EVENT_TYPE>(i), id, 0, 0, false);
-
-////        auto ev_ptr = event_list::instance()->get_event_card(
-////                card_ptr->m_id, card_ptr->m_type, static_cast<EVENT_TYPE>(i));
-////        if(ev_ptr && !ev_ptr->is_end()) //
-////        {
-////            event_list::copy_event(card_ptr, ev_ptr);
+    //    //删除
+    //    //card_ptr->del_card_pos();
+    // 升井 删除所有报警信息
+    for(int i=0; i < CARD_EVENT_COUNT_MAX; i++ )
+    {
+        if (i == EVENT_TYPE::ET_CARD_LOW_POWER_SERIOUS)
+        {
+            continue;
+        }
 
-////            ev_ptr->m_status = ES_END;
+        uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+        event_tool::instance()->handle_event(OT_CARD, static_cast<EVENT_TYPE>(i), id, 0, 0, false);
 
-////            event_list::save_event(ev_ptr);
-////        }
-//    }
+        //        auto ev_ptr = event_list::instance()->get_event_card(
+        //                card_ptr->m_id, card_ptr->m_type, static_cast<EVENT_TYPE>(i));
+        //        if(ev_ptr && !ev_ptr->is_end()) //
+        //        {
+        //            event_list::copy_event(card_ptr, ev_ptr);
 
+        //            ev_ptr->m_status = ES_END;
 
+        //            event_list::save_event(ev_ptr);
+        //        }
+    }
 }
 
 
@@ -302,7 +301,7 @@ void module_meta_date_changed::deal_call_edit_lights_group(int id, EDIT_TYPE_ID
 
 void module_meta_date_changed::init_setting()
 {
-//pRes = getMysqlRes("select setting_id, name, type, value from dat_setting;");
+    //pRes = getMysqlRes("select setting_id, name, type, value from dat_setting;");
 }
 
 void module_meta_date_changed::remove_card(uint32_t id, int32_t type)
@@ -315,22 +314,22 @@ void module_meta_date_changed::remove_card(uint32_t id, int32_t type)
         return;
     }
 
-//    auto area_hover_ptr = card_ptr->get_area_hover();
-//    if(area_hover_ptr && 0!=area_hover_ptr->id() && 0!=area_hover_ptr->mapid())
-//    {
-//        module_area::on_leave(card_ptr->m_id, area_hover_ptr, card_ptr->m_type);
-//    }
+    //    auto area_hover_ptr = card_ptr->get_area_hover();
+    //    if(area_hover_ptr && 0!=area_hover_ptr->id() && 0!=area_hover_ptr->mapid())
+    //    {
+    //        module_area::on_leave(card_ptr->m_id, area_hover_ptr, card_ptr->m_type);
+    //    }
 
-//    if(card_ptr->is_person())
-//    {
-//        module_attendance_person::up_mine(card_ptr, nullptr);
-//    }
-//    else
-//    {
-//        module_attendance_vehicle::save_attendance(card_ptr, nullptr);
+    //    if(card_ptr->is_person())
+    //    {
+    //        module_attendance_person::up_mine(card_ptr, nullptr);
+    //    }
+    //    else
+    //    {
+    //        module_attendance_vehicle::save_attendance(card_ptr, nullptr);
 
-//        module_meta_date_changed::clear_card(card_ptr);
-//    }
+    //        module_meta_date_changed::clear_card(card_ptr);
+    //    }
 
     module_meta_date_changed::clear_card(card_ptr);
     // 避免状态重置

module_service/module_meta_date_changed.h

@@ -8,8 +8,9 @@
 
 #include"module_singleton_base.h"
 #include"websocket/sio/sio_client.h"
-//#include"card.h"
-#include"area.h"
+
+struct card_location_base;
+struct area;
 
 
 enum EDIT_TYPE_ID

module_service/module_mgr.cpp

@@ -11,6 +11,7 @@
 #include"area_business_geofault.h"
 #include"log.h"
 #include"common_tool.h"
+#include "config_file.h"
 
 /**
  * @brief 注册web回调函数，读配置文件，启动向web发送线程

module_service/module_mgr.h

@@ -11,9 +11,9 @@
  */
 
 #include "module_singleton_base.h"
-#include "config_file.h"
 #include "websocket/wsClientMgr.h"
 #include "common.h"
+struct config_file;
 
 class module_mgr: public singleton_base<module_mgr>
 {

module_service/module_web.h

@@ -45,7 +45,7 @@ public:
      */
     void init(config_file& config, std::map<std::string, YA::MSG_HANDLE_FUNC_TYPE>& MsgFuncList)
     {
-        sleep_ms = std::stoi(config.get("service.interval_send_json_alarm","10000"));
+        sleep_ms = std::stoi(config.get("service.interval_send_json_alarm_ms","10000"));
 
         MsgFuncList.insert( std::make_pair( JSON_CMD_VALUE_META_DATA_CHANGED, &module_web::accept ) );
         MsgFuncList.insert( std::make_pair( JSON_CMD_VALUE_REQUEST_ALL_DATA, &module_web::accept ) );