1.人卡2s推送一次2.传来基础数据操作协议统一成string

card_person.cpp

@@ -141,6 +141,11 @@ void person::handle_three_rates(const point & pt)
 
 void person::on_timer()
 {
+    if(!m_1sto2s){
+        m_1sto2s=true;
+        return ;
+    }
+    m_1sto2s=false;
     if(!m_mine_tool->m_is_attendance)
 	{
 		if(m_upmine_flag.load())

card_person.h

@@ -13,6 +13,7 @@ struct person:card_location_base, card_area
     static int m_limit_detained_time;
     static int m_auto_up_mine_time;
     static int m_person_cards_flag;
+    bool       m_1sto2s{true};
     std::weak_ptr<monkey_person> m_monkeyPerson;
     std::string m_stafferName,m_deptName;
     person(const std::string &type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid,int wl,const std::string &sname,const std::string &dname,int workrype_id);

mine_business.cpp

@@ -452,7 +452,7 @@ void reverse_alarm_business::get_status()
     for(const auto &x:m_working_sensor)
     {
         char strsql[512]={0};
-        snprintf(strsql,512, "SELECT data_value FROM his_sensor_data WHERE  write_time > DATE_SUB(NOW(),INTERVAL 3 MINUTE) and sensor_id = %d ORDER BY write_time DESC LIMIT 1;",x.second);
+        snprintf(strsql,512, "SELECT data_value FROM his_sensor_data WHERE  write_time > DATE_SUB(NOW(),INTERVAL 3 MINUTE) and write_time < now() and sensor_id = %d ORDER BY write_time DESC LIMIT 1;",x.second);
         std::string Error;
         YADB::CDBResultSet DBRes;
         sDBConnPool.Query(strsql,DBRes,Error);

module_service/module_meta_date_changed.cpp

@@ -29,13 +29,13 @@ void module_meta_date_changed::accept(sio::message::ptr const& data)
     std::string szParam = "0";
     tool_map::try_get_value(szParam,JSON_KEY_ID,data);
 
-    int id=-1;
-    tool_map::try_get_value(id,JSON_KEY_ID,data);
+   // int id=-1;
+   // tool_map::try_get_value(id,JSON_KEY_ID,data);
 
     std::string op_type="";
     tool_map::try_get_value(op_type, JSON_KEY_OP_TYPE, data);
 
-    log_info("web发来数据：JSON_CMD_VALUE_META_DATA_CHANGED,%d.%s---%s",id,szParam.c_str(),op_type.c_str());
+    log_info("web发来数据：JSON_CMD_VALUE_META_DATA_CHANGED,%s---%s",szParam.c_str(),op_type.c_str());
     if(!szParam.empty() && !op_type.empty())
     {
         EDIT_TYPE_ID edit_type_id;
@@ -61,7 +61,7 @@ void module_meta_date_changed::accept(sio::message::ptr const& data)
         }
         else if(JSON_KEY_NAME_AREA == name)
         {
-            deal_call_edit_area(szParam,id, edit_type_id);
+            deal_call_edit_area(szParam, edit_type_id);
         }
         else if(JSON_KEY_NAME_READER == name)
         {
@@ -185,15 +185,15 @@ void module_meta_date_changed::deal_call_edit_card(std::string & id64, EDIT_TYPE
     }
 }
 
-void module_meta_date_changed::deal_call_edit_area(const std::string& id, int& aid,EDIT_TYPE_ID edit_type_id)
+void module_meta_date_changed::deal_call_edit_area(const std::string& id,EDIT_TYPE_ID edit_type_id)
 {
+    int cid = std::stoi(id);
     if(ET_INSERT == edit_type_id || ET_UPDATE == edit_type_id)
     {
-        area_list::instance()->init_from_db(aid);
+        area_list::instance()->init_from_db(cid);
     }
     else if(ET_DELETE == edit_type_id)
     {
-        int cid = std::stoi(id);
         if(auto area_ptr = area_list::instance()->get(cid))
         {
             log_info("区域删除：areaid=%d", cid);

module_service/module_meta_date_changed.h

@@ -59,7 +59,7 @@ private:
 
     void deal_call_edit_antenna(int id,EDIT_TYPE_ID edit_type_id);
 
-    void deal_call_edit_area(const std::string & id,int &iid, EDIT_TYPE_ID edit_type_id);
+    void deal_call_edit_area(const std::string & id, EDIT_TYPE_ID edit_type_id);
 
     void deal_call_edit_map(int id, EDIT_TYPE_ID edit_type_id);