fix the statistics of the vehicle

Home/Lib/Action/ApiAction.class.php

@@ -503,6 +503,9 @@ class ApiAction extends Action {
 		if($lock_state == 1){
 			$lastLoction = Redis('rfld_gps_last_location', 'hash');
 			$lockInfo = $lastLoction->get($gpsNumber);
+			if(!$lockInfo){
+				json_fail('无法获取到末次定位位置，请确保定位正常');
+			}
 			
 			$lockInfoRedis = Redis('czapp_lockinfo', 'hash');
 			$lockInfoRes = $lockInfoRedis->add(array($gpsNumber => $lockInfo));
@@ -830,8 +833,16 @@ class ApiAction extends Action {
 			$lng2 = $result[$i+1]['lng'];
 			$dist = $this->get_2points_distance($lat1,$lng1,$lat2,$lng2 );
 			$totalDist += $dist;
+			
 			$time = strtotime($result[$i+1]['OnlineTime']) - strtotime($result[$i]['OnlineTime']);
-			$totalTime += ($time/3600);
+			
+			if($time < 300){
+				$totalTime += $time;
+			}
+		}
+		
+		if($totalTime){
+			$totalTime = $totalTime/3600;
 		}
 		
 		return array(

Home/Lib/Action/NoticeAction.class.php

@@ -187,8 +187,6 @@ class NoticeAction extends Action {
 		);
 		// 可选项
 		$options = array(
-		    'sendno' => 100,
-		    'time_to_live' => 100,
 		);
 		// 组装推送
 		$cid = $client->push()->getCid();
@@ -342,11 +340,13 @@ class NoticeAction extends Action {
  
 	public  function getResultInterval( $interval, $msg_data, $type, $cache ){
 		$last_alarm_time = S( $cache.$msg_data['device_number'] );
-		if( time() - $last_alarm_time < $interval ){
+		
+		if($last_alarm_time){
 			return array( 'success' => false , 'message' => $msg_data['device_number'] . '【'. $type .'】' . ' 不可推送，推送间隔最小为:'. $interval. '秒，最后一次告警时间：'.$last_alarm_time );
-		}else{
-			return array( 'success' => true , 'message' => $msg_data['device_number'] . '【'. $type .'】' .' 不在限制间隔内，可以推送');
 		}
+		$last_alarm_time = time();
+		S($cache.$msg_data['device_number'], $last_alarm_time, $interval);
+		return array( 'success' => true , 'message' => $msg_data['device_number'] . '【'. $type .'】' .' 不在限制间隔内，可以推送');
 	}