修改禁止人员下井的SQL

card_base.cpp

@@ -166,8 +166,9 @@ void card_location_base::put_three_rates(card_pos & cp)
 		cp.reader_y = _areatool->m_site->y;
 		cp.reader_id = _areatool->m_site->m_id;
 	}
-    log_info("three_rates:type:%d,id:%d,cid:%d",cp.type,cp.id,cp.identifier_id);
-    three_rates::get_instance()->put(cp);
+
+	log_info("three_rates:type:%d,id:%d,cid:%d",cp.type,cp.id,cp.identifier_id);
+	three_rates::get_instance()->put(cp);
 }
 
 bool card_location_base::is_person() const

forbid_staff_down_mine.cpp

@@ -6,11 +6,10 @@
 void forbid_staff_down_mine::init_forbid_staff(int id /* = -1*/)
 {
     std::string sql = "select id,staff_id,start_time,end_time,status,oper_time,lastupdate from rt_person_forbid_down_mine ";
-    sql += " where status = 1 and end_time > now() ";
     if (id != -1)
-        sql += " and id = " + std::to_string(id) + ";";
+        sql += " where id = " + std::to_string(id) + ";";
     else
-        sql += ";";
+        sql += " where status = 1 or end_time > now() ;";
 
     std::string Error;
     YADB::CDBResultSet DBRes;

forbid_staff_down_mine.h

@@ -10,7 +10,6 @@
 #include <string>
 #include <map>
 #include <list>
-#include "db_api/CDBResultSet.h"
 
 struct SForbidStaffInfo
 {
@@ -38,8 +37,6 @@ struct SForbidStaffList
 struct forbid_staff_down_mine
         :single_base<forbid_staff_down_mine,int,std::shared_ptr<SForbidStaffList>>
 {
-public:
-    ~forbid_staff_down_mine(){}
 public:
     // 根据数据库中的自增长id
     void init_forbid_staff(int id = -1);

main.cpp

@@ -42,35 +42,33 @@ void Handle_ThreeRates_Event_Callback(const int evType, const int evId, uint64_t
 
 struct Init_Setting
 {
-    void init() {
+    void init()
+    {
         YADB::_DB_POOL_SETTING_ DBSetting;
-        DBSetting.Host = config.get("db.host", "127.0.0.1");
-        DBSetting.User = config.get("db.user", "root");
-        DBSetting.PWD = config.get("db.passwd", "123456");
-        DBSetting.DBName = config.get("db.dbname", "yaxt");
-        DBSetting.CharSet = config.get("db.charset", "utf8");
-        DBSetting.TimeOut = config.get("db.conn_timeout", 5);
-        DBSetting.PoolSize = config.get("db.pool_size", 30);
-        DBSetting.Port = config.get("db.port", 3306);
-        if (!_mysql_init(DBSetting)) {
-            std_info("连接DB[%s:%s] 失败，采集服务器无法启动!", DBSetting.Host.c_str(), DBSetting.User.c_str());
+        DBSetting.Host = config.get("db.host","127.0.0.1");
+        DBSetting.User = config.get("db.user","root");
+        DBSetting.PWD = config.get("db.passwd","123456");
+        DBSetting.DBName = config.get("db.dbname","yaxt");
+        DBSetting.CharSet = config.get("db.charset","utf8");
+        DBSetting.TimeOut = config.get("db.conn_timeout",5);
+        DBSetting.PoolSize = config.get("db.pool_size",30);
+        DBSetting.Port = config.get("db.port",3306);
+        if(!_mysql_init(DBSetting))
+        {
+            std_info("连接DB[%s:%s] 失败，采集服务器无法启动!",DBSetting.Host.c_str(),DBSetting.User.c_str());
             exit(0);
         }
 
-        std::string url = config.get("service.websocket_url", "ws://127.0.0.1:8086");
-        int32_t send_interval = config.get("service.interval_send_json_postion", 1);
-        std_info("json_interval:%d", send_interval);
+        std::string url=config.get("service.websocket_url","ws://127.0.0.1:8086");
+        int32_t send_interval =config.get("service.interval_send_json_postion",1);
+        std_info("json_interval:%d",send_interval);
         std::vector<std::string> url_list;
         url_list.push_back(url);
-        if (!wsClientMgr_init(url_list, send_interval))
+        if(!wsClientMgr_init(url_list,send_interval))
         {
-            std_info("连接webServer[%s] 失败，采集服务器无法启动!", url.c_str());
+            std_info("连接webServer[%s] 失败，采集服务器无法启动!",url.c_str());
             exit(0);
         }
-
-        //三率模块
-        init_three_rates(DBSetting);
-
 		CYaSetting::Init_sys_setting();
         sit_list::instance()->load_from_db();
         card_list::instance()->init_card_from_db();
@@ -88,24 +86,28 @@ struct Init_Setting
 		mine_business::inst()->load();
         event_list::instance()->load_his_data_from_db();
         card_list::instance()->load_his_card_postion_from_db();
+        db_para dp;	
+        dp.Host=DBSetting.Host;
+        dp.User=DBSetting.User;
+        dp.PWD=DBSetting.PWD ;
+        dp.DBName=DBSetting.DBName;
+        dp.CharSet=DBSetting.CharSet ;
+        dp.TimeOut=DBSetting.TimeOut;
+        dp.PoolSize=DBSetting.PoolSize;
+		init_three_rates(dp);
+
+
         log_info("Init_Setting::init  Success. \n" );
+
     }
 
-	void init_three_rates(const YADB::_DB_POOL_SETTING_ & dbset)
+	void init_three_rates(const db_para& dbs)
 	{
-        db_para dps;
-        dps.Host = dbset.Host;
-        dps.User = dbset.User;
-        dps.PWD = dbset.PWD;
-        dps.DBName = dbset.DBName;
-        dps.CharSet = dbset.CharSet;
-        dps.TimeOut = dbset.TimeOut;
-        dps.PoolSize = dbset.PoolSize;
-
+		log_info("init three_rates ...................");
 		init_para ip;
 		ip.send_pt = handlereader;
 		ip.driving_face_alarm = Handle_ThreeRates_Event_Callback;
-		three_rates::get_instance()->init(ip,dps);
+		three_rates::get_instance()->init(ip,dbs);
 		three_rates::get_instance()->start();
         std_info("加载三率模块成功");
 	}