Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

module_service/module_meta_date_changed.cpp

@@ -12,6 +12,7 @@
 #include"area.h"
 #include "forbid_staff_down_mine.h"
 #include "landmark.h"
+#include <three_rates.h>
 #include"area_business_geofault.h"
 #include <boost/format.hpp>
 #include <boost/tokenizer.hpp>
@@ -111,6 +112,11 @@ void module_meta_date_changed::accept(sio::message::ptr const& data)
 		{
 			deal_call_edit_landmark(szParam, edit_type_id);
 		}
+		else if (JSON_KEY_NAME_COALFACE==name|| JSON_KEY_NAME_COALFACE_VEHICLE == name || 
+			JSON_KEY_NAME_DRIVING_FACE == name || JSON_KEY_NAME_DRIVINGFACE_VEHICLE == name )
+		{			
+			three_rates::get_instance()->update_db_data(name, szParam, edit_type_id);
+		}
         else
         {
             log_error("web发来的数据: 基础数据name字段错误：name=%s", name.c_str());

websocket/constdef.h

@@ -75,6 +75,12 @@
 
 #define JSON_KEY_NAME_GEO_FAULT "geofault"
 #define JSON_KEY_NAME_LANDMARK "landmark"
+
+#define JSON_KEY_NAME_COALFACE "coalface"
+#define JSON_KEY_NAME_COALFACE_VEHICLE "coalface_vehicle"
+#define JSON_KEY_NAME_DRIVING_FACE "drivingface"
+#define JSON_KEY_NAME_DRIVINGFACE_VEHICLE "drivingface_vehicle"
+
 //禁止指定人员下井
 #define JSON_KEY_NAME_FORBID_PERSON_DOWN_MINE "rt_person_forbid_down_mine"
 //设置区域中时间段人员超员阈值等数据