chensongchao 5 years ago
parent
commit
dc15db7bfd
3 changed files with 3 additions and 7 deletions
  1. 3 1
      card.cpp
  2. 0 3
      ya_setting.cpp
  3. 0 3
      ya_setting.h

+ 3 - 1
card.cpp

@@ -249,12 +249,14 @@ void card_list::load_his_card_postion_vehicle()
 
 void card_list::load_his_card_postion_staff()
 {
+    std::string init_limit_hour = config.get("service.init_limit_hour","48");
+
     std::string sql = "select l.card_id,l.site_id, l.cur_time, l.x, l.y, l.z, l.area_info, l.state, \
             att.start_time, att.end_time \
             from rt_location l, rt_att_staff att, dat_card c, dat_staff_extend s \
             where l.card_id = c.card_id and l.card_id = att.card_id and l.card_id=s.card_id\
             and c.state_id=0 and end_time is null ";
-    sql += " and timestampdiff(hour ,att.start_time,now()) <= " + std::to_string(CYaSetting::g_load_person_his_data_interval) + ";";
+    sql += " and timestampdiff(hour ,att.start_time,now()) <= " + init_limit_hour + ";";
 
 	log_info("load_his_card_postion_staff:%s ",sql.c_str());
 

+ 0 - 3
ya_setting.cpp

@@ -5,8 +5,6 @@
 #include <config_file.h>
 extern config_file config;
 SSys_setting CYaSetting::m_sys_setting;
-
-int CYaSetting::g_load_person_his_data_interval = 48;
 /*
 * 从数据库的dat_setting表初始化系统阈值,
 * 包括:井下人员阈值,井下车辆阈值,人员超时阈值,车辆超时阈值,车辆超速阈值
@@ -14,7 +12,6 @@ int CYaSetting::g_load_person_his_data_interval = 48;
 bool CYaSetting::Init_sys_setting()
 {
     {
-		g_load_person_his_data_interval = config.get("service.init_limit_hour",48);
         m_sys_setting.rav_disable=config.get("service.rav_disable","");
         log_info("rav_disable:%s",m_sys_setting.rav_disable.c_str());
     }

+ 0 - 3
ya_setting.h

@@ -63,9 +63,6 @@ public:
     */
     static SSys_setting m_sys_setting;
     static bool Init_sys_setting();
-
-    //加载人员历史定位,考勤数据(间隔48小时,不在加载)间隔时间(小时)
-    static int g_load_person_his_data_interval;
 };
 
 #endif