Merge branch 'master' of chensongchao/ya-serv into master

area.cpp

@@ -413,6 +413,9 @@ void area_list::init_from_db(int id/*=-1*/)
 			int area_id  = 0;
 			DBRes.GetField( "area_id",area_id, Error );
 
+			std::string area_name = "";
+			DBRes.GetField( "name",area_name, Error );
+
 			int map_id  = 0;
 			DBRes.GetField( "map_id",map_id, Error );
 
@@ -485,9 +488,9 @@ void area_list::init_from_db(int id/*=-1*/)
 				for(const auto &p : tmp_ptr->m_bound)
 					log_info("point:area_id:%d--x:%.2f,y:%.2f",area_id,p.x,p.y);
 
-				log_info("基础数据 增加或修改区域成功：区域id:%d,over_count_person:%d over_time_person:%d,scale:%.2f,map_id:%d\
+				log_info("基础数据 增加或修改区域成功：区域id:%d-%s,over_count_person:%d over_time_person:%d,scale:%.2f,map_id:%d\
 						,area_type_id:%d,over_count_vehicle:%d,over_time_vehicle:%d",
-						id,over_count_person, over_time_person,scale,map_id,area_type_id,
+						id,area_name.c_str(),over_count_person, over_time_person,scale,map_id,area_type_id,
 						over_count_vehicle,over_time_vehicle);
 
 				if(newobj)

db/db_card.cpp

@@ -198,9 +198,13 @@ namespace db_card
             std::shared_ptr<card_location_base> clb =
                     std::make_shared<person>(strategy,vsid,need_display,card_type_id,dept_id,occupation_level_id,staff_id,work_line,staffer_name,dept_name,worktype_id);
             uint64_t cardid = tool_other::type_id_to_u64(card_type_id,vsid);
-            log_info("cardId:%llu,id:%d dept_id:%d,need_display:%d,card:%s:work_line:%d,staff_id:%d,type:%d,staffer_name:%s,dept_name:%s",
-                     cardid,vsid,dept_id,need_display,card_id.c_str(),work_line,staff_id,card_type_id,staffer_name.c_str(),dept_name.c_str());
-			map.insert({cardid,clb});
+            if ("" != lszId64)
+            {
+				log_info("Check Card.cardId:%llu,id:%d dept_id:%d,need_display:%d,card:%s:work_line:%d,staff_id:%d,type:%d,staffer_name:%s,dept_name:%s",
+						cardid, vsid, dept_id, need_display, card_id.c_str(), work_line, staff_id, card_type_id,
+						staffer_name.c_str(), dept_name.c_str());
+			}
+            map.insert({cardid,clb});
 		}
 		return map;
 	}

forbid_staff_down_mine.cpp

@@ -5,7 +5,7 @@
 
 void forbid_staff_down_mine::init_forbid_staff(int id /* = -1*/,int etype)
 {
-    std::string sql = "select id,staff_id,start_time,end_time,status,oper_time,lastupdate from rt_person_forbid_down_mine where ";
+    std::string sql = "select id,staff_id,start_time,end_time,status,oper_time,last_update from rt_person_forbid_down_mine where ";
     if (id != -1)
         sql += " id = " + std::to_string(id) + ";";
     else
@@ -34,7 +34,7 @@ void forbid_staff_down_mine::init_forbid_staff(int id /* = -1*/,int etype)
         std::string create_time;
         DBRes.GetField("oper_time", create_time, Error);
         std::string update_time;
-        DBRes.GetField("lastupdate", update_time, Error);
+        DBRes.GetField("last_update", update_time, Error);
         time_t stime = tool_time::to_time(start_time);
         time_t etime = tool_time::to_time(end_time);
         std::shared_ptr<SForbidStaffList> s = forbid_staff_down_mine::instance()->get(staff_id);

module_service/module_meta_date_changed.cpp

@@ -35,7 +35,7 @@ void module_meta_date_changed::accept(sio::message::ptr const& 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,%s---%s",szParam.c_str(),op_type.c_str());
+    log_info("web发来数据：cmd=meta_data_changed.name:%s Param:%s OpType:%s",name.c_str(),szParam.c_str(),op_type.c_str());
     if(!szParam.empty() && !op_type.empty())
     {
         EDIT_TYPE_ID edit_type_id;
@@ -44,8 +44,6 @@ void module_meta_date_changed::accept(sio::message::ptr const& data)
             log_error("web发来的数据: 基础数据op_type字段错误：op_type=%s", op_type.c_str());
             return;
         }
-		log_info("基础数据 receive meta_data_changed: %s, id=%s, op_type=%d"
-		        , name.c_str(), szParam.c_str() , edit_type_id);
 
         if(JSON_KEY_NAME_VEHICLE == name || JSON_KEY_NAME_VEHICLE_EXTEND == name)
         {