主干去掉 最小系统功能

card_base.cpp

@@ -166,11 +166,8 @@ 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;
 	}
-	if (!CYaSetting::g_minSystem)
-	{
-		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

main.cpp

@@ -44,12 +44,6 @@ void Handle_ThreeRates_Event_Callback(const int evType, const int evId, uint64_t
 struct Init_Setting
 {
     void init() {
-        //是否最小系统
-        CYaSetting::g_minSystem = config.get("minsystem", 0);
-        if (CYaSetting::g_minSystem)
-        {
-            s_min_system.initSystem(&config);
-        }
         YADB::_DB_POOL_SETTING_ DBSetting;
         DBSetting.Host = config.get("db.host", "127.0.0.1");
         DBSetting.User = config.get("db.user", "root");
@@ -63,22 +57,21 @@ struct Init_Setting
             std_info("连接DB[%s:%s] 失败，采集服务器无法启动!", DBSetting.Host.c_str(), DBSetting.User.c_str());
             exit(0);
         }
-        if (!CYaSetting::g_minSystem)
+
+        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))
         {
-            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))
-            {
-                std_info("连接webServer[%s] 失败，采集服务器无法启动!", url.c_str());
-                exit(0);
-            }
-
-            //三率模块
-            init_three_rates(DBSetting);
+            std_info("连接webServer[%s] 失败，采集服务器无法启动!", url.c_str());
+            exit(0);
         }
+
+        //三率模块
+        init_three_rates(DBSetting);
+
 		if(0)
 		{
 			std::vector<char> b(1024*1024);

min_system.cpp

@@ -1,61 +0,0 @@
-//
-// Created by Administrator on 2019/3/15.
-//
-
-#include "min_system.h"
-#include "ya_setting.h"
-#include "forbid_staff_down_mine.h"
-#include <ev++.h>
-#include "card.h"
-#include "log.h"
-#include "config_file.h"
-
-min_system::min_system ()
-{
-    m_thread.reset(new std::thread(std::bind(&min_system::run,this)));
-    m_lastTimer = time(nullptr) ;
-    m_interval_time = 30;
-}
-
-void min_system::initSystem(config_file * config)
-{
-    std_info("当前系统: 采集最小系统,和虹膜考勤系统相关! 初始化最小系统");
-    if (config)
-    {
-        m_interval_time = config->get("min_system_interval_time",60);
-    }
-}
-
-//定时重新加载相关数据
-void min_system::on_timer_load()
-{
-    if (!CYaSetting::g_minSystem)
-    {
-        return ;
-    }
-    forbid_staff_down_mine::instance()->on_load_data();
-}
-
-void min_system::run()
-{
-    ev::timer timer_1s(*this);
-
-    timer_1s.set<min_system,&min_system::on_time>(this);
-    timer_1s.start(m_interval_time,m_interval_time);
-
-    ev::dynamic_loop::run(0);
-    //log_info("worker_thread exit....");
-}
-
-void min_system::on_time()
-{
-    std_info("min_system::on_time ");
-    time_t cur_time = time(nullptr);
-    s_min_system.on_timer_load();
-    if (cur_time - s_min_system.m_lastTimer > 60 * 60)
-    {
-        card_list::instance()->init_staffer("");
-    }
-    s_min_system.m_lastTimer = time(nullptr);
-}
-

min_system.h

@@ -1,40 +0,0 @@
-//
-// Created by Administrator on 2019/3/15.
-//
-
-#ifndef WORKSPACE_MIN_SYSTEM_H
-#define WORKSPACE_MIN_SYSTEM_H
-
-#include <boost/serialization/singleton.hpp>
-#include <thread>
-#include "zloop.h"
-struct task;
-struct config_file;
-
-class min_system: zloop<task*>
-{
-public:
-    min_system();
-    ~min_system(){};
-
-    void initSystem(config_file * config);
-private:
-    void run();
-    //定时时间处理 每分钟
-    void on_time();
-
-    //定时重新加载相关数据
-    void on_timer_load();
-private:
-    std::unique_ptr<std::thread> m_thread;
-    // 上传加载时间
-    time_t m_lastTimer;
-    // 间隔多久加载一次 (秒)
-    int m_interval_time;
-};
-
-//单件相关定义
-typedef boost::serialization::singleton<min_system> singleton_min_system ;
-#define s_min_system singleton_min_system::get_mutable_instance()
-
-#endif //WORKSPACE_MIN_SYSTEM_H

ya_setting.cpp

@@ -3,7 +3,6 @@
 #include "log.h"
 
 SSys_setting CYaSetting::m_sys_setting;
-bool CYaSetting::g_minSystem  = false;
 /*
 * 从数据库的dat_setting表初始化系统阈值，
 * 包括：井下人员阈值，井下车辆阈值，人员超时阈值，车辆超时阈值，车辆超速阈值

ya_setting.h

@@ -54,10 +54,6 @@ public:
     */
     static SSys_setting m_sys_setting;
     static bool Init_sys_setting();
-
-    //是否最小系统
-    //最小系统 用于 和虹膜考勤系统相关---只负责考勤定位不用其他功能
-    static bool g_minSystem ;
 };
 
 #endif