fix

Home/Lib/Action/CronAction.class.php

@@ -249,16 +249,16 @@ class CronAction extends Action {
  
 	private  function produceAcrossAlarmData( $route_info ){
 		if( !$route_info['DeviceId'] ){
-			return 'device id is not exists.';
+			return array('success' => false, 'message' => 'device id is not exists.');
 		}
 		if( !$route_info['Longitude'] ){
-			return 'longitude is not exists.';
+			return array('success' => false, 'message' => 'longitude is not exists.');
 		}
 		if( !$route_info['Latitude'] ){
-			return 'latitude is not exists.';
+			return array('success' => false, 'message' => 'latitude is not exists.');
 		}
 		if( !$route_info['DeviceTime'] ){
-			return 'device time is not exists.';
+			return array('success' => false, 'message' => 'device time is not exists.');
 		}
 		// 从数据库中取出车牌号，缓存1天
 		if( S('plate-'.$route_info['DeviceId']) ){
@@ -274,14 +274,14 @@ class CronAction extends Action {
 		$fence = json_decode($fence, true);
 		
 		if( empty($fence) ){
-			return '围栏信息不存在';
+			return array('success' => false, 'message' => '围栏信息不存在');
 		}
 		if( !$fence['fenceStatus'] ){
-			return '未启用围栏';
+			return array('success' => false, 'message' => '未启用围栏');
 		}
 		$fence_info = $fence['fenceInfo'];
 		if( empty($fence_info['data']) ){
-			return '围栏坐标数据不存在';
+			return array('success' => false, 'message' => '围栏坐标数据不存在');
 		}
 		// 是否越界
 		$route_point = array(
@@ -295,7 +295,7 @@ class CronAction extends Action {
 		}elseif( $fence_info['type'] == 'polygon' ){ // 多边形围栏
 			$result = \Jms\Algo\Geometry::isInPolygon($fence_info['data']['vertex'], $route_point);
 		}else{
-			return '未知围栏类型';
+			return array('success' => false, 'message' => '未知围栏类型');
 		}
 		if( !$result ){
 			$alarm_data = array(
@@ -306,10 +306,9 @@ class CronAction extends Action {
 			  "device_number" => $route_info['DeviceId']
 			);
 			kafkaProducer('gps_alarm_msg_queue', $alarm_data); // 添加到kafka
-			return '添加告警消息到 gps_alarm_msg_queue ';
+			return array('success' => true, 'message' => '添加围栏告警消息到 gps_alarm_msg_queue');
 		}
-		
-		return '没有超出围栏';
+		return array('success' => false, 'message' => '没有超出围栏');
 		
 	}
 	

Home/Lib/Action/NoticeAction.class.php

@@ -83,7 +83,7 @@ class NoticeAction extends Action {
 						if($msg_data){
 						   // 使用极光推送消息
 							if(!C('JPUSH_APP_KEY') || !C('JPUSH_MASTER_SECRET')){
-								echo 'jpush app key or secret not exists',PHP_EOL;
+								echo $msg_data['device_number'] . 'jpush app key or secret not exists'.PHP_EOL;
 								break;
 							}
 							$jpush_client = new \JPush\Client( C('JPUSH_APP_KEY'), C('JPUSH_MASTER_SECRET') );
@@ -290,7 +290,7 @@ class NoticeAction extends Action {
 			$cache = 'last_outage_alarm_';
 		}
 		
-		if($msg_data['type'] == \Rlfd\Alarm\PushTypeEnum::FENCE_ALARM ){
+		if($msg_data['type'] == \Rlfd\Alarm\PushTypeEnum::HIGHVOLTAGE_ALARM ){
 			$interval = C('HIGHVOLTAGE_ALARM_INTERVAL_SECOND') ? C('HIGHVOLTAGE_ALARM_INTERVAL_SECOND') : 300;
 			$type = '高电压报警';
 			$cache = 'last_highvoltage_alarm_';
@@ -302,7 +302,7 @@ class NoticeAction extends Action {
 			if($lockStatus == 1){
 				return array('success' => false, 'message' => $msg_data['device_number'].'已启用czapp锁车，无需推送gps位移告警');
 			}
-			
+		
 			$interval = C('SHIFT_ALARM_INTERVAL_SECOND') ? C('SHIFT_ALARM_INTERVAL_SECOND') : 120;
 			$type = 'gps位移报警';
 			$cache = 'last_shift_alarm_';
@@ -320,7 +320,7 @@ class NoticeAction extends Action {
 			$cache = 'last_takeapart_alarm_';
 		}
 		
-		if($msg_data['type'] == \Rlfd\Alarm\PushTypeEnum::TAKEAPART_ALARM ){
+		if($msg_data['type'] == \Rlfd\Alarm\PushTypeEnum::CRASH_ALARM ){
 			$interval = C('CRASH_ALARM_INTERVAL_SECOND') ? C('CRASH_ALARM_INTERVAL_SECOND') : 120;
 			$type = '碰撞报警';
 			$cache = 'last_crash_alarm_';
@@ -339,13 +339,13 @@ class NoticeAction extends Action {
 	
  
 	public  function getResultInterval( $interval, $msg_data, $type, $cache ){
-		$last_alarm_time = S( $cache.$msg_data['device_number'] );
+		$last_alarm_time = S( $cache.'-'.$type.'-'.$msg_data['device_number'] );
 		
 		if($last_alarm_time){
 			return array( 'success' => false , 'message' => $msg_data['device_number'] . '【'. $type .'】' . ' 不可推送，推送间隔最小为:'. $interval. '秒，最后一次告警时间：'.$last_alarm_time );
 		}
 		$last_alarm_time = time();
-		S($cache.$msg_data['device_number'], $last_alarm_time, $interval);
+		S($cache.'-'.$type.'-'.$msg_data['device_number'], $last_alarm_time, $interval);
 		return array( 'success' => true , 'message' => $msg_data['device_number'] . '【'. $type .'】' .' 不在限制间隔内，可以推送');
 	}