包头同步数据

Home/Lib/Action/JyzlCronAction.class.php

@@ -32,11 +32,14 @@ class JyzlCronAction extends Action {
 	
  
 	public  function sync(  ){
-		echo "同步数据开始 time:".date("Y-m-d H:i:s")."\n";
+		echo "同步数据开始 time:".date("Y-m-d H:i:s").PHP_EOL;
 		$this->syncJyzlCity();
 		$this->syncJyzlStation();
+		
+		echo "jjyzl_vehicle数据开始同步".PHP_EOL;
 		$this->syncJyzlVehicle();
-		echo "同步数据结束 time:".date("Y-m-d H:i:s")."\n";
+		echo "Jjyzl_vehicle数据结束同步".PHP_EOL;
+		echo "同步数据结束 time:".date("Y-m-d H:i:s").PHP_EOL;
 	}
 	
  
@@ -135,7 +138,7 @@ class JyzlCronAction extends Action {
 			}
 		}*/
 		$result = array( 'success' => true, 'message' => 'sync data success', 'error'=>$error );	
-		echo json_encode($result)."\n";
+		echo json_encode($result).PHP_EOL;
 	}
 	
  
@@ -173,8 +176,6 @@ class JyzlCronAction extends Action {
 		ini_set('memory_limit', '256M');
 		$count = $this->model_jms_vehicle->count();
 		$pageCount = ceil($count/$this->size);//总页数
-		$jms_vehicle_list_data = [];//数据源
-		$jyzl_vehicle_list_data = [];//同步数据
 		$diff_jyzl_vehicle_list_data = [];
 		for ($i = 1; $i < $pageCount + 1; $i++) {
 			$p = ($i-1)*$this->size;
@@ -192,15 +193,16 @@ class JyzlCronAction extends Action {
 			//获取差异的用户详细信息
 			$diff_jyzl_vehicle_list = $this->getDetailDiff($diff_info_list, $this->model_jms_vehicle, $this->field_jyzl_vehicle);
 			//sleep(5);
-			$diff_jyzl_vehicle_list_data = array_merge($diff_jyzl_vehicle_list_data, $diff_jyzl_vehicle_list);
+			//$diff_jyzl_vehicle_list_data += $diff_jyzl_vehicle_list;
+			if(!empty($diff_jyzl_vehicle_list['add']) || !empty($diff_jyzl_vehicle_list['update'])) {//忽略删除数据的情况
+				$this->submitDetailDiff($diff_jyzl_vehicle_list, $this->model_jyzl_vehicle);	
+			}
 		}
 		//不考虑jzyl_vehicle 里面有数据 但是jms_vehicle 无数据的情况
 		//$jyzl_vehicle_ids = $this->model_jyzl_vehicle->getField("ID",true);//获取同步数据表所有的ID
 		//$jms_vehicle_list_ids = $this->model_jms_vehicle->getField("ID",true);//获取数据源表所有的ID
 		//$diff_ids = array_diff($jyzl_vehicle_ids, $jms_vehicle_list_ids);
 		//$diff_jyzl_vehicle_list_data['del'] = empty($diff_ids)?[]:array_values($diff_ids);
-		
-		$this->submitDetailDiff($diff_jyzl_vehicle_list_data, $this->model_jyzl_vehicle);
 	}