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

common.h

@@ -103,6 +103,7 @@ enum EVENT_TYPE{ // 事件类型
     ET_AREA_OVER_COUNT_PERSON = 3,	// 区域人员超员
     ET_AREA_OVER_COUNT_VEHICLE = 4,	// 区域车辆超员
     ET_READER_ERROR = 6,
+
     ET_CARD_LOW_POWER_SERIOUS = 12, // 电量极低
     ET_CARD_OVER_TIME_PERSON = 13, // 人员井下超时
     ET_CARD_OVER_TIME_VEHICLE = 14, // 车辆井下超时
@@ -114,12 +115,13 @@ enum EVENT_TYPE{ // 事件类型
     ET_CARD_OVER_SPEED = 21, // 车辆超速
     ET_CARD_AREA_OVER_SPEED = 22, // 车辆区域超速
     ET_CARD_HELP = 24, // 人员呼救
-
+    ET_CARD_DRIVINGFACE_WARNING_AREA = 28, //掘进面靠近预警区域告警
     ET_CARD_MOTIONLESS=32,//静止不动告警
     ET_READER_POWER_BY_BATTERY=33,//分站电池：1为电池供电，0为交流电供电，当电池供电需要告警
-	ET_VEHICLE_REAR_END=36,
+	ET_VEHICLE_REAR_END=36,//车辆防追尾告警
+	ET_COALING_DRIVING_DRIVER = 37,//工作面(采煤面和掘进面)司机与车卡告警;
     ET_VEHICLE_NEAR_GEOFAULT=38,//靠近断层告警
-	ET_READER_LOCATION_REVERSAL=39,
+	ET_READER_LOCATION_REVERSAL=39,//掘进面天线反向告警
     CARD_EVENT_COUNT_MAX
 };
 

event.cpp

@@ -115,9 +115,9 @@ void Event::handle_alarm_event(EVENT_TYPE et,uint64_t id,double limit_value,doub
                 ev_ptr->m_limit_value=limit_value;
                 ev_ptr->m_desc=desc;
                 ev_ptr->m_id=eid;
+                //保存告警信息
+                event_list::instance()->add(eid,ev_ptr);
             }
-            //保存告警信息
-            event_list::instance()->add(eid,ev_ptr);
         }
     }
     else

module_service/area_business_count_checker.cpp

@@ -46,7 +46,7 @@ void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
 	{
 		a->m_area->m_person_count ++ ;
         int pc=a->m_area->m_person_count.load();
-		if (!a->m_area->m_event_person_count && pc > a->m_area->m_limit_person_count)
+		if (pc > a->m_area->m_limit_person_count)
 		{
 			a->m_area->m_event_person_count = true;
 			EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
@@ -60,7 +60,7 @@ void area_business_count_checker::on_enter(const std::shared_ptr<area_hover>&a,
 		a->m_area->m_vehicle_count ++ ;
         int vc=a->m_area->m_vehicle_count.load();
 		log_info("area_id:%d,v_count:%d",a->m_area->m_id,vc);
-		if (vc > a->m_area->m_limit_vehicle_count && !a->m_area->m_event_vehicle_count)
+		if (vc > a->m_area->m_limit_vehicle_count)
 		{
 			a->m_area->m_event_vehicle_count = true;
 			EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;

module_service/area_business_geofault.cpp

@@ -95,13 +95,10 @@ void area_business_geofault::on_hover(const std::shared_ptr<area_hover>&area_hov
     {
         ptr_temp->m_near_geofault_count=_geofault_count_limit;
 
-        if(!ptr_temp->m_is_warning)
-        {
-            ptr_temp->m_is_warning = true;
-            uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
-            event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id,
-                                                 CYaSetting::m_sys_setting.geofault_warn_dis, dist, true);
-        }
+        ptr_temp->m_is_warning = true;
+        uint64_t id = tool_other::type_id_to_u64(card_ptr->m_type, card_ptr->m_id);
+        event_tool::instance()->handle_event(OT_CARD, ET_VEHICLE_NEAR_GEOFAULT, id,
+                                             CYaSetting::m_sys_setting.geofault_warn_dis, dist, true);
     }
 
     //确定正常

module_service/area_business_person_dwell_checker.cpp

@@ -34,7 +34,7 @@ void area_business_person_dwell_checker::on_hover(const std::shared_ptr<area_hov
 	double limit_val = a->m_area->m_limit_person_second;
 	double cur_val = ( tool_time::now_to_seconds() - a->m_enter_time / 1000);
 	EVENT_TYPE evType = a->m_area->is_mine() ? EVENT_TYPE::ET_CARD_OVER_TIME_PERSON : EVENT_TYPE::ET_CARD_AREA_OVER_TIME_PERSON;
-	if (!c->get_event_flag(evType) && limit_val < cur_val)
+	if (limit_val < cur_val)
     {
         c->set_event_flag(evType);
         uint64_t id = tool_other::type_id_to_u64(c->m_type, c->m_id);

module_service/module_web.cpp

@@ -138,7 +138,7 @@ void module_web::_delete_end(std::vector<std::shared_ptr<ya_event>>& arr)
         }
     }
 
-    if(todelete.size())
+    if(!todelete.empty())
     {
         event_list::instance()->remove(todelete);
     }