Browse Source

static init

lixioayao 6 years ago
parent
commit
0bfa4dc8e7

+ 1 - 1
area_business.h

@@ -13,7 +13,7 @@ struct area_hover;
 struct card_location_base;
 struct area_business
 {
-	virtual int area_business_type();
+	virtual int area_business_type()=0;
 
 	virtual void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data>&ptr){}
 	virtual void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr){}

+ 0 - 71
module_service/area_business_car_attendance.cpp

@@ -35,15 +35,6 @@ void area_business_car_attendance::on_enter(const std::shared_ptr<area_hover>&ar
     }
 
     save_attendance(card_ptr, area_hover_ptr);
-
-    //    auto ptr_temp = std::make_shared<car_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_car_attendance::on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c,std::shared_ptr<business_data> ptr)
@@ -75,58 +66,8 @@ void area_business_car_attendance::on_leave(const std::shared_ptr<area_hover>&a,
         //                         area_ptr->m_id,mine_tool_ptr->m_stat_attendance);
     }
 
-    //    if(nullptr == ptr)
-    //    {
-    //        log_error("结束考勤失败:nullptr == ptr");
-    //        return;
-    //    }
-
-    //    auto ptr_temp = static_cast<car_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);
-    //    }
 }
 
-//void area_business_car_attendance::init_attendance_area_from_db()
-//{
-//    const char *sql = "select a.area_id, a.att_rule_id,  vt.vehicle_type_id \
-//            from dat_att_rule_area a, dat_att_rule_vehicle_type  vt, dat_att_rule r\
-//            where a.att_rule_id=vt.att_rule_id and a.att_rule_id=r.att_rule_id;";
-//    std::string Error;
-//    YADB::CDBResultSet DBRes;
-//    sDBConnPool.Query(sql,DBRes,Error);
-//    if(!Error.empty())
-//        log_error("初始化attendance_area Error,%s",Error.c_str());
-//    uint64_t nCount = DBRes.GetRecordCount( Error );
-//    if(int64_t(nCount) <= 0)
-//    {
-//        log_error("初始化attendance_area Error,%s",Error.c_str());
-//    }
-
-//    log_info( "init_attendance_area_from_db. The record count=%ld\n", nCount );
-
-//    m_map.clear();
-//    while ( DBRes.GetNextRecod(Error) )
-//    {
-//        int area_id  = 0;
-//        DBRes.GetField( "area_id",area_id, Error );
-
-//        int att_rule_id  = 0;
-//        DBRes.GetField( "att_rule_id",att_rule_id, Error );
-
-//        int vehicle_type_id  = 0;
-//        DBRes.GetField( "vehicle_type_id",vehicle_type_id, Error );
-
-//        m_map.insert(std::make_pair(to_list_id(area_id, vehicle_type_id), att_rule_id));
-//    }
-//}
-
-///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)
 {
@@ -140,17 +81,5 @@ void area_business_car_attendance::save_attendance(const std::shared_ptr<card_lo
     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);
-//    }
 }
 

+ 0 - 18
module_service/area_business_car_attendance.h

@@ -20,24 +20,6 @@ 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);
-
-//private:
-//    bool is_not_attendance_area(int area_id, int vehicle_type_id)
-//    {
-//        return  m_map.end() != m_map.find(to_list_id(area_id, vehicle_type_id));
-//    }
-
-//    uint64_t to_list_id(int area_id, int vehicle_type_id)
-//    {
-//        return (static_cast<uint64_t>(area_id)<<32) | static_cast<uint64_t>(vehicle_type_id);
-//    }
-
-//    ///area_id<<32| vehicle_type_id; att_rule_id
-//    std::unordered_map<uint64_t, int> m_map;
 };
-
-
 #endif // AREA_BUSINESS_CAR_ATTENDANCE_H

+ 2 - 0
module_service/area_business_geofault.cpp

@@ -23,6 +23,8 @@ struct geofault_data:business_data
     int m_far_geofault_count;
 };
 
+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)
 {

+ 0 - 1
module_service/area_business_geofault.h

@@ -85,7 +85,6 @@ private:
 private:
     //area_id: points
     static std::unordered_map<int, std::vector<point>> _area_geofault_map;
-
     static int _geofault_count_limit;
 };
 

+ 1 - 0
module_service/area_business_motionless_persion.h

@@ -59,4 +59,5 @@ public:
 
 };
 
+int area_business_motionless_persion::_acc_0count_limit;
 #endif // MODULE_MOTIONLESS_PERSION_H

+ 1 - 0
module_service/area_business_speed_checker.cpp

@@ -22,6 +22,7 @@ struct over_speed_data:business_data
     double m_limit_speed;
 };
 
+std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;
 area_business_speed_checker::area_business_speed_checker()
 {
 }